Merge branch 'hotfix/1.0.15' v1.0.15
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 22:18:44 +0000 (17:18 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 22:18:44 +0000 (17:18 -0500)
commit3d58df9b0ab24ce395fec727b756ebab8c3d44e1
tree4a20b14fb93dee2f8ee306177412843f941351e8
parent558100a460762df064093a630b2958fb0b5d2649
parentdbaea9f2b7a4974e8e1cf10bb8618202dc8ecaf8
Merge branch 'hotfix/1.0.15'