Merge branch 'hotfix/1.1.2' v1.1.2
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 19:04:02 +0000 (15:04 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 19:04:02 +0000 (15:04 -0400)
commit920709334aebe639741649144ef52f270000228a
treea61ea82e2771f3417c7e936b3061d7bf1d1f9040
parent7900d1277cad06311f98c835e64f8fe5e65ade70
parent44badf19f5c24e6c7fd5240ae927fe89238dd8f6
Merge branch 'hotfix/1.1.2'