Merge tag 'V1.1.17' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 3 Dec 2015 19:15:17 +0000 (14:15 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 3 Dec 2015 19:15:17 +0000 (14:15 -0500)
commit303c0f6459bd349eac3b177121521ae022805f12
tree9e8ab898893ea05e1528d312fe1ead7ef2e32798
parent64e3c3e9e3eed5ee02108486b0a0e1bded1bfb31
parent71c840e6ab929e9e2f85e7df6346f29bfad2b88c
Merge tag 'V1.1.17' into develop

v1.1.17