projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0237715 a6439c7)
Merge branch 'master' of git.clinicalfuture.com:arvados
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 30 Apr 2014 20:55:06 +0000 (16:55 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 30 Apr 2014 20:55:06 +0000 (16:55 -0400)
# 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.


Trivial merge