Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 16:07:20 +0000 (12:07 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 16:07:20 +0000 (12:07 -0400)
commit6ecd5d67238d7f0a84e1ecbcd929e667840767c9
tree2ee3d077325e1d65c3e30b109d91aa04e1d270ee
parent3984aac90c05ed250baa79b61779d2c15e27a599
parent0beaf9f92985d50dbae7060b2b1623dff1dda592
Merge branch 'hotfix/1.0.18'