Merge branch 'master' of git.clinicalfuture.com:arvados
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 8 May 2014 20:54:18 +0000 (16:54 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 8 May 2014 20:54:18 +0000 (16:54 -0400)
commitef47dfeb871015d9da6d5e2e0a04100c2e9e8eee
treeed6c5706d930c20cfa5a8c7d20585532b27f37cf
parent383aa9f906c32876a71599024084283627070adb
parentf990e6880050eafaf3b6bfd063e36aa016e8682a
Merge branch 'master' of git.clinicalfuture.com:arvados

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.