Merge branch 'hotfix/1.1.2' V1.1.2
authorLaury GvR <laury@gaslightmedia.com>
Wed, 18 Nov 2015 14:10:16 +0000 (09:10 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 18 Nov 2015 14:10:16 +0000 (09:10 -0500)
commit376f52544ca8ed85b41f41bdb019591d100ce22a
tree38b8d54f17f99a4ffc9588507ac7ca9f30f72ca8
parent32190c70a103fec1a153242b7a103d0a89a8d288
parent9bd29a22d5e2c1c7410c9156148aa7eff1bfc01c
Merge branch 'hotfix/1.1.2'