Merge branch 'hotfix/1.0.11' v1.0.11
authorLaury GvR <laury@gaslightmedia.com>
Tue, 19 Jan 2016 22:02:30 +0000 (17:02 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 19 Jan 2016 22:02:30 +0000 (17:02 -0500)
commitd1e6481cf26704a5cee0041d21f13167021a903a
tree152b42a65aa7602d73adec812a6b9ebf6323921a
parent3f656931b6e293a69e68a25ab6606ddfdae68401
parent16eeef07960c6239089e1faf467f3ab59e5f8029
Merge branch 'hotfix/1.0.11'