Merge branch 'master' into 3586-job-priority
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 2 Sep 2014 20:16:13 +0000 (16:16 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 2 Sep 2014 20:16:13 +0000 (16:16 -0400)
commit04bce28b705a6ca33d2c9b19aa783f588a99c8e0
tree2531507623b614f7cfe0f8609b74f1983dd68da7
parent80cbf4d912084fd80930cef112189024071eb4eb
parent94982cd84ed3b39dca8d47a7786133eac3885a92
Merge branch 'master' into 3586-job-priority

Conflicts:
services/api/db/structure.sql
services/api/db/structure.sql