Merge tag 'v1.2.40' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 29 Apr 2015 13:44:22 +0000 (09:44 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 29 Apr 2015 13:44:22 +0000 (09:44 -0400)
commitaa08ccf2c32d152a36c018ea46f2c50409755e65
tree3221f9618a9db38c9b9bb52acb4cb2f35bc7942d
parent9c28cb3af11b44832ddd1d63bf660efc54df2437
parente53056cdfe9a8e937100435de685cd889bde0a68
Merge tag 'v1.2.40' into develop

Version 1.2.40