Merge branch 'hotfix/1.4.6' v1.4.6
authorLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 18:15:41 +0000 (14:15 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 24 Mar 2016 18:15:41 +0000 (14:15 -0400)
commitabb26ae7012acde1054086f04e6d1ffe9117107b
tree652ce04d7df77973c89199f2dbb4eb2ee60bf135
parentdb112f0368dbb57e5aefefbb12d27a6ab4faeae2
parentc29cf8566c173152615f0df8ecfc1029c4e6523b
Merge branch 'hotfix/1.4.6'