Merge branch 'hotfix/1.2.4' v1.2.4
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Nov 2015 20:06:40 +0000 (15:06 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Nov 2015 20:06:40 +0000 (15:06 -0500)
commit02861b20bdd1eafc55d18c60ddccd78b0560b2b3
treeb86ebe681b6a1f05fac4e073127c37444e96248c
parentaed1249d9921465e41c5737c0d54c2042a9a036a
parentdfeee4b48983f8ff42e6a528c6cf6c48cd6a5928
Merge branch 'hotfix/1.2.4'