Merge branch 'release/1.0.17' v1.0.17
authorLaury GvR <laury@gaslightmedia.com>
Thu, 12 Jan 2017 22:25:04 +0000 (17:25 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 12 Jan 2017 22:25:04 +0000 (17:25 -0500)
commit79c3087472fd324d49f30837063a60439301c7ac
tree55d308cb7715d77a2b701260d0f4d99a2f63de44
parent742902bab869dc9dc4a1046b1faab9687c86c74a
parent3ed69644aac5ee9dd48a68a21f631d9964104c42
Merge branch 'release/1.0.17'