Merge tag 'v1.0.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 18:57:01 +0000 (14:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 18:57:01 +0000 (14:57 -0400)
commit5c563efce3e7e2350e6be77617c948b447c17f67
tree76d06f1ae68f6974bd505ac88ba05d1a2fecc8da
parentd8565f9a9ab86dc4e0ffa97adb05ea704e26e7b0
parente50f8bcc4ac3b61615f11d91b424fd83fbdd3b04
Merge tag 'v1.0.17' into develop

v1.0.17