Merge branch 'master' of git.curoverse.com:arvados into 3408-production-datamanager
authormishaz <misha@curoverse.com>
Sun, 11 Jan 2015 18:29:13 +0000 (18:29 +0000)
committerTom Clegg <tom@curoverse.com>
Fri, 13 Feb 2015 21:25:29 +0000 (16:25 -0500)
commit5bcba288077488791daa43a15d5fd5fb0c6e653c
tree5bba9d409be9c7be6f9ff2f7a086172087d7f621
parent95cbdf59eb5326c393ae91f243f596984cba7fa7
parent61fdce2ec17d5892642be7a957b824f9d311c192
Merge branch 'master' of git.curoverse.com:arvados into 3408-production-datamanager

Conflicts resolved:
services/api/Gemfile
services/api/Gemfile.lock