Merge tag 'v1.2.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 11 May 2015 15:40:29 +0000 (11:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 11 May 2015 15:40:29 +0000 (11:40 -0400)
commit0f2e75f24c9409d5b46414e1b1f6cdc6d7cff382
tree66197f6a88a6ca01a2c70950b4452c2ab4d97a30
parent234e2822bf21224a474cac8bc3f31d66f6247def
parent597dd33eec83fc0e9f147897ba80258bced0e879
Merge tag 'v1.2.0' into develop

Version 1.2.0