Merge tag 'v1.0.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jan 2016 16:35:24 +0000 (11:35 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jan 2016 16:35:24 +0000 (11:35 -0500)
commitff9c3ce0118a240bb3cc7cba75b1dcb5708ed9a5
tree50776353404fe38851b408bfb2960fbe12a1a5f6
parentedbd957d178e0c37ea8d30a58ef5a9d8fe2ca533
parent5f03c9f33a60f0b1dfe56dfdfc2687016652bb89
Merge tag 'v1.0.17' into develop

v1.0.17