Merge branch 'hotfix/1.0.9' v1.0.9
authorlaury <laury@gaslightmedia.com>
Mon, 6 Jun 2016 20:32:45 +0000 (16:32 -0400)
committerlaury <laury@gaslightmedia.com>
Mon, 6 Jun 2016 20:32:45 +0000 (16:32 -0400)
commit25353cb824efbae3f33f51aab30f3a70143744a2
tree0dceb29c9cbc66a156d13934100a1c0370230e27
parent4cab7c900a90fbee534b1870c4094d2a995fc6d5
parent815af564b40da1af229f80e03e335d2333e30a61
Merge branch 'hotfix/1.0.9'