Merge branch 'hotfix/1.0.20' v1.0.20
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 13 Mar 2015 16:48:47 +0000 (12:48 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 13 Mar 2015 16:48:47 +0000 (12:48 -0400)
commit75e88d10533ecc9216ccc95d7ff0e646582f5f2a
treee2e4da54a2543dfc61b101f451112d3df64779d1
parent8aa5fd172c6653f7441beff4aa52cccc8d755834
parentcd98446ac779fa3457ca50757ccd7bc666461a2b
Merge branch 'hotfix/1.0.20'