Merge branch 'master' into 2505-update-docs
authorTom Clegg <tom@curoverse.com>
Wed, 23 Apr 2014 21:31:14 +0000 (17:31 -0400)
committerTom Clegg <tom@curoverse.com>
Wed, 23 Apr 2014 21:31:14 +0000 (17:31 -0400)
commitad79a64bd1503e1e47d3849a00b894c4a6bc9810
treed2a6e6652430f771a591646a3283da1e794da3dc
parent7cbc35ccbc4d78bb43c901e197a1746a325173c0
parent22db59393203f550e0c77e65c650e664667492ab
Merge branch 'master' into 2505-update-docs

Conflicts:
.gitignore
.gitignore
services/api/app/models/job.rb