Merge branch 'master' of git.curoverse.com:arvados
authorTim Pierce <twp@curoverse.com>
Wed, 21 May 2014 19:29:54 +0000 (15:29 -0400)
committerTim Pierce <twp@curoverse.com>
Wed, 21 May 2014 19:54:57 +0000 (15:54 -0400)
Refs #2755.


Trivial merge