projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46e1645 354367a)
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)
# 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