Merge branch 'release/1.2.0'
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 2 May 2016 15:26:33 +0000 (11:26 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 2 May 2016 15:26:33 +0000 (11:26 -0400)
commit4a2b0c0649ac090ed7221e14284a5957dd69b316
tree80d605e1f9aec97817b33ea9b33f556ce363dc07
parentb6cbc6557395a59836215a5f7e81768dbe1cbe09
parentffaf6f8da4ef4c0904e243ff7bdde2c5385b2f96
Merge branch 'release/1.2.0'