Merge branch 'hotfix/1.0.29' v1.0.29
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Aug 2014 13:31:08 +0000 (09:31 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Aug 2014 13:31:08 +0000 (09:31 -0400)
commit9a4c953c474db32f4975016b41819e30838071bc
tree449928bad18d0fbd9a6653a467c68711f5b2e6a7
parent03111240d0fc6b0f67b0dcba638672544fea5015
parent9075addb8df92f214e1c4baf9a8a72f77a458a2f
Merge branch 'hotfix/1.0.29'