Merge branch 'master' of git.clinicalfuture.com:arvados
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 21 Jan 2014 22:03:00 +0000 (17:03 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 21 Jan 2014 22:03:00 +0000 (17:03 -0500)

Trivial merge