Merge branch 'hotfix/1.0.5' v1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Thu, 29 Oct 2015 13:35:50 +0000 (09:35 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 29 Oct 2015 13:35:50 +0000 (09:35 -0400)
commit852428375e386eb4969a2c928e3f01b913fe19de
tree73b7e867afb01815999ac688cb27dde50ec2ba5d
parent4c86e710d759d37be29c8fdbb111c8334192e0a2
parent4e19cd09c731bf3dd4b8aa5897d94f1d168dedac
Merge branch 'hotfix/1.0.5'