Merge branch 'release/1.2.0' v1.2.0
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Mar 2015 14:13:26 +0000 (10:13 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 20 Mar 2015 14:13:26 +0000 (10:13 -0400)
commite71d8992eed2837ed22c53e36281cecbed8815ee
tree7c6ac05271303313092e37234395ef095c3a6c63
parentd6d925b468eadb00e010e0918e38f92c4f019a41
parent97d08fed1de5997c5d4649f6dfd9fc809ea19ee2
Merge branch 'release/1.2.0'