Merge branch 'hotfix/1.0.17' v1.0.17
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jan 2016 16:35:18 +0000 (11:35 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jan 2016 16:35:18 +0000 (11:35 -0500)
commit5f03c9f33a60f0b1dfe56dfdfc2687016652bb89
tree50776353404fe38851b408bfb2960fbe12a1a5f6
parenta966cd1acbe5f810e5fbb236fb6ca8c65053f66c
parent7336cf36b9ac8525e0a187a1f6e3778a215b41bf
Merge branch 'hotfix/1.0.17'