Merge branch 'hotfix/1.0.17' v1.0.17
authorIan Weller <ian@gaslightmedia.com>
Tue, 3 May 2016 15:16:39 +0000 (11:16 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 3 May 2016 15:16:39 +0000 (11:16 -0400)
commit32dc2ce6532ecbcffa8c699436cdd24f0cda5271
tree3a03873591e04dafc9a9959d217ecd6434006a87
parente11532ea482472cd42083e0509c988b0fb88537a
parent9b6de9369f32fb6869a5613c6acedcfcd6efedb8
Merge branch 'hotfix/1.0.17'