From: Tom Clegg <tom@curoverse.com>
Date: Wed, 12 Nov 2014 18:42:51 +0000 (-0500)
Subject: Merge branch '4434-collation' closes #4434
X-Git-Tag: 1.1.0~2006
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/5141c3ee23e89696773e227a93236ef2a51543c2?hp=--cc

Merge branch '4434-collation' closes #4434
---

5141c3ee23e89696773e227a93236ef2a51543c2