Merge branch 'hotfix/1.1.15' v1.1.15
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:18:57 +0000 (14:18 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:18:57 +0000 (14:18 -0400)
commit65413d36edd681ee772daf98da5044afb7d7ec30
tree61896cbc5d2642b8b1838af9a7619e95b7f4c0a2
parent21bf2355920c8c129794132bc4a7de4c5937d0c1
parent4fae98710923c0b772d283fc420eab9cb98f2532
Merge branch 'hotfix/1.1.15'