3894: Merge branch 'master' into 3894-gem-version
authorTom Clegg <tom@curoverse.com>
Fri, 19 Sep 2014 21:40:28 +0000 (17:40 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 19 Sep 2014 21:40:28 +0000 (17:40 -0400)
commitfb9235f1b9abe0661eb7640c4db0ab7001f90f1d
treeec41fd1df9666bec22453da866f212010a0cb51c
parent1ccabc86f9eb3b51e02a3571d5b133fec8258f49
parentf47d364957c90269535d3992cd048ce5aef95cd0
3894: Merge branch 'master' into 3894-gem-version