Merge branch 'hotfix/1.1.12' v1.1.12
authorLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 21:01:58 +0000 (17:01 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 14 Apr 2015 21:01:58 +0000 (17:01 -0400)
commit9a71adaff616497c3ff1824ae1d4a363f94b6d16
tree3076d82411849947b510092f6613771e42272744
parentbd979d5b332bb3e65f1258d464bb10e431f47d85
parentbcd7b577ba149da8682d3b20f2b5d47661d16488
Merge branch 'hotfix/1.1.12'