Merge branch 'hotfix/1.2.1'
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 2 May 2016 17:58:04 +0000 (13:58 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 2 May 2016 17:58:04 +0000 (13:58 -0400)
commit177a262810a8849420d837a4b802e170ecabf5ec
tree172aa6aca105dbc5b2e7cf4abd8b760a8807c38c
parent4a2b0c0649ac090ed7221e14284a5957dd69b316
parent061ba2c4fb886c64889056b508f3c9cd5b7e816b
Merge branch 'hotfix/1.2.1'