Merge tag 'v1.2.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 2 May 2016 15:26:40 +0000 (11:26 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 2 May 2016 15:26:40 +0000 (11:26 -0400)
commit04959ed20822c46ee4b144bedff105300fb9f6df
tree80d605e1f9aec97817b33ea9b33f556ce363dc07
parent59b0edb8c478fe5eedad3929c7a4b5010c5f7269
parent4a2b0c0649ac090ed7221e14284a5957dd69b316
Merge tag 'v1.2.0' into develop

Version 1.2.0