Merge branch 'release/1.2' v1.2
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Oct 2014 14:47:17 +0000 (10:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Oct 2014 14:47:17 +0000 (10:47 -0400)
commit50e525efe57c637f64b19181b0f6bf1ffe16dd1b
treee6fdf51f6b8a34e5449131ce578546dfc33c2e77
parent0e24461b2d58f0ff036c70d695945270eb70da65
parent76289748cf1b2e2ad7ee1301af67bd94c25760a7
Merge branch 'release/1.2'