Merge tag 'v1.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Oct 2014 14:47:23 +0000 (10:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Oct 2014 14:47:23 +0000 (10:47 -0400)
commitebcc6062aa41176c0f40b26604f6f43b854bf988
treee6fdf51f6b8a34e5449131ce578546dfc33c2e77
parent76289748cf1b2e2ad7ee1301af67bd94c25760a7
parent50e525efe57c637f64b19181b0f6bf1ffe16dd1b
Merge tag 'v1.2' into develop

Version 1.2