Merge branch 'hotfix/2.0.15' v2.0.15
authorLaury GvR <laury@gaslightmedia.com>
Fri, 28 Oct 2016 18:57:56 +0000 (14:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 28 Oct 2016 18:57:56 +0000 (14:57 -0400)
commitd704dff7ffce63d2dbbc46f411affdd62e2ef126
tree2ab2a639786f5d2ea4e70205ea84dcd30c21a8af
parent4642f4d79b6d6b673f0cfba5eb1a460517a30a7b
parentd0ebbe06c0559900c519206ca9c5c433b50895ef
Merge branch 'hotfix/2.0.15'