Merge branch 'hotfix/1.0.24' v1.0.24
authorIan Weller <ian@gaslightmedia.com>
Thu, 21 Aug 2014 19:22:54 +0000 (15:22 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 21 Aug 2014 19:22:54 +0000 (15:22 -0400)
commit42d8c6e4023199ebbcc6e00f34a3f14ff987b6e4
tree1feab463acb8081da7704918de4384bce6e69274
parent27bac775d567bd745301b930e8edb0efb7186455
parentdd8f96af80f9c901365282ba7ff9d980d14a4ff0
Merge branch 'hotfix/1.0.24'