Merge branch 'hotfix/1.0.2'
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 18:41:07 +0000 (14:41 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 18:41:07 +0000 (14:41 -0400)
commita1893a5d7724b7f1d17d20ac282ad384185c504b
tree2f4f185528efc07ae67dfb8237e3b93a58528172
parent82a78f2b39b1bdcfb5bbf0d0920e8973a72858dd
parentda59dde62b14e1efb1368b28db53b5d896e98a64
Merge branch 'hotfix/1.0.2'