Merge branch 'master' into 3898-job-state-attr
authorradhika <radhika@curoverse.com>
Fri, 19 Sep 2014 16:27:21 +0000 (12:27 -0400)
committerradhika <radhika@curoverse.com>
Fri, 19 Sep 2014 16:27:21 +0000 (12:27 -0400)
commit2bc8ce335b15136ce39b2652ab41e20b15632d08
treed1dad5e0836e2cf8d0ad4f8e45b9763a7d936289
parentf6cd6a5f0ca78c51c30e2689ca3d5a4caeb41073
parent5bb258b6e289b97e4bda28ff1b2d50a255339030
Merge branch 'master' into 3898-job-state-attr

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