Merge branch 'hotfix/1.1.5'
authorLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:55:42 +0000 (15:55 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 9 Feb 2016 20:55:42 +0000 (15:55 -0500)
commit6d21515737ff7346b6e65c6199bf92aea25acae0
treef762d6eafc4ec6fb397085a17d14e516d467b0ff
parent1f24e07ceea077b75a4159a10033909187ab95d7
parentcc22234893d4810c1f1b10a6483e2fd40ae60271
Merge branch 'hotfix/1.1.5'