Merge tag 'v1.0.17' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:36:00 +0000 (17:36 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:36:00 +0000 (17:36 -0500)
commitd7ce3e6e6bf5dd5b3db3777370b233b787c6a874
tree35ea00e3b3c7841b8fabd1906fc81a08403ee5b9
parent37dcaf33257f6a35317927ae0c23feada6cc113a
parent75bb315dbd5647f2b8003e0ba9e3aeab97c548f2
Merge tag 'v1.0.17' into develop

v1.0.17