projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 22dc7d5 d088be4)
Merge branch '1675-preactivation'
authorTom Clegg <tom@curoverse.com>
Tue, 31 Dec 2013 02:02:33 +0000 (18:02 -0800)
committerTom Clegg <tom@curoverse.com>
Tue, 31 Dec 2013 02:02:33 +0000 (18:02 -0800)
closes #1722
closes #1785


Trivial merge