Merge branch 'master' of git.clinicalfuture.com:arvados
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 21 Mar 2014 16:57:04 +0000 (12:57 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 21 Mar 2014 16:57:04 +0000 (12:57 -0400)
commit027953372c41b16b191d9a1124b82f1c21a759f9
tree8ddfb2c536ff0d54a87fe11a11aa5c1ab968ce07
parent46e1645bb91debb3e4ad98b82895ada5329e9351
parent354367a4c824a1e44192f2ea9364fd9414162f4d
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.