Merge branch 'hotfix/1.2.39' v1.2.39
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Apr 2015 12:48:55 +0000 (08:48 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Apr 2015 12:48:55 +0000 (08:48 -0400)
commit4de852b1a02507b31e745e2536bb35ac2fa5dcfd
tree6e286f8a6b825b03fa05e713ffa74a5fcf2d0fa8
parent2a94ff76a93bef7f6f0bd08e674ab5ebb2b220ba
parent840056a419b8824659df125d17a6809e0fafc7a7
Merge branch 'hotfix/1.2.39'