Merge branch 'hotfix/1.0.2' v1.0.2
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 19:35:13 +0000 (15:35 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 19:35:13 +0000 (15:35 -0400)
commit393272d36c0a45572bbbca0927afa3588cf8dbb9
tree99a24b5e37697e70377258bcbe723d6c14014792
parent6aa7e96a8deb64b15a491927cc70e24293269dfc
parent74be2ec568f5a6df35838819d61c849aad21b3d0
Merge branch 'hotfix/1.0.2'