Merge branch 'hotfix/1.0.24' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 21 Aug 2014 19:23:23 +0000 (15:23 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 21 Aug 2014 19:23:23 +0000 (15:23 -0400)
commiteb9cf1f9028a21710d9e95ec576220c4a8e2dcf0
tree1feab463acb8081da7704918de4384bce6e69274
parent13b67a7ed422040a6521ee0bdc79b92414ea9f1a
parentdd8f96af80f9c901365282ba7ff9d980d14a4ff0
Merge branch 'hotfix/1.0.24' into develop