Merge branch 'hotfix/1.2.40' v1.2.40
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 29 Apr 2015 13:44:12 +0000 (09:44 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 29 Apr 2015 13:44:12 +0000 (09:44 -0400)
commite53056cdfe9a8e937100435de685cd889bde0a68
tree3221f9618a9db38c9b9bb52acb4cb2f35bc7942d
parent4de852b1a02507b31e745e2536bb35ac2fa5dcfd
parent9751e4b37158aed003b2f7d1295425b322d7d14b
Merge branch 'hotfix/1.2.40'