Merge branch 'hotfix/1.0.24' master
authorIan Weller <ian@gaslightmedia.com>
Fri, 23 Sep 2016 14:44:43 +0000 (10:44 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 23 Sep 2016 14:44:43 +0000 (10:44 -0400)
commit7a05ce6bbd24b3df5e7420ffc4e60f6e3649965e
tree7b18552d479c0e83d4f8c73631e8b8c09202fbaa
parentcace869e06e796a473484ae21050eb29a9c5d290
parent3300281015c107c18c0df701b55baf7eb7d96fe3
Merge branch 'hotfix/1.0.24'