3894: Merge branch 'master' into 3894-gem-version
authorTom Clegg <tom@curoverse.com>
Mon, 22 Sep 2014 15:19:04 +0000 (11:19 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 22 Sep 2014 15:19:04 +0000 (11:19 -0400)
commitc446dd845656e944c2d3f91f8d00e320c37b66a1
treea015b345a1f2ea09f878ca24cc9eb5e3cdb1a1ba
parentc24d0cc28ee40a37d7f0ead787394765386e5413
parentb96a5d949f88fa4f11570ffdf3b951602a3ea4aa
3894: Merge branch 'master' into 3894-gem-version