Merge branch 'hotfix/1.1.20' v1.1.20
authorLaury GvR <laury@gaslightmedia.com>
Thu, 16 Apr 2015 13:57:54 +0000 (09:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 16 Apr 2015 13:57:54 +0000 (09:57 -0400)
commit79b1370eaecfbeeeeccca65fb0fa5e3c1b03eb88
tree4f2a643a9e1becbd85121521e3fd7762cb3fe439
parent49c6529a09481d125e2a02c273d46e055ec6d123
parent39bf58fd3f81c744959ca5ef53cc9ebc5a8129b5
Merge branch 'hotfix/1.1.20'