Merge branch 'hotfix/1.1.1' v1.1.1
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 18:43:01 +0000 (14:43 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 18:43:01 +0000 (14:43 -0400)
commit7900d1277cad06311f98c835e64f8fe5e65ade70
treefb666d1c1d8e8028ddce6dad5312d6c54608219b
parenteb6cd791c7558bfa8fbac0597c5de9047899bfaf
parentebb45166f7aef917bbcc2a5ef2bd15a5fd55e374
Merge branch 'hotfix/1.1.1'