Merge branch 'hotfix/1.0.1' v1.0.1
authorLaury GvR <laury@gaslightmedia.com>
Thu, 25 Jun 2015 17:43:00 +0000 (13:43 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 25 Jun 2015 17:43:00 +0000 (13:43 -0400)
commit696f55995b214d8f9fcb290b1785e72e337a8aec
tree5b34f38bd380c2dba86f19ef2c5cfdc67586e8c2
parent21cd14851467bc1efa91681bd50bde1d24eccea2
parent54b2ba89832940929b20ea7408f2cb8527763ce3
Merge branch 'hotfix/1.0.1'