Merge branch 'hotfix/1.1.29' V1.1.29
authorLaury GvR <laury@gaslightmedia.com>
Thu, 11 Feb 2016 16:31:56 +0000 (11:31 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 11 Feb 2016 16:31:56 +0000 (11:31 -0500)
commit09ac49249ebc1a30428e62087d82998f94f41adb
tree6dfd59b1e4460fbbab1037663ca7075a2ee628a7
parent1a534112e492748ec58e4a5d000497c2931aafc0
parentbbbabcc04494214aed4bb509023d9286e8e9a68f
Merge branch 'hotfix/1.1.29'