Merge branch 'hotfix/1.1.1' v1.1.1
authorLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 18:32:57 +0000 (13:32 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 17 Nov 2015 18:32:57 +0000 (13:32 -0500)
commitc36bb1ce3eb4c5f89d514de12119e856165f9b5a
tree08dd2d90e4c56cf45e38d6d78d974e08903d89b5
parent89951d02fb164d6303ffe6cea39992bbadfd1e43
parent0fe3c836460ca5c96f30985b9563544dce53400b
Merge branch 'hotfix/1.1.1'