Merge branch 'master' of git.clinicalfuture.com:arvados
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 9 Jan 2014 17:09:45 +0000 (12:09 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 9 Jan 2014 17:09:45 +0000 (12:09 -0500)

Trivial merge