projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 49d9534 ebf0021)
Merge branch 'master' into 2776-keep-services-table
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 21 May 2014 18:31:03 +0000 (14:31 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 21 May 2014 18:31:03 +0000 (14:31 -0400)

Trivial merge