Merge tag 'v1.0.36' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 26 Oct 2015 20:26:49 +0000 (16:26 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 26 Oct 2015 20:26:49 +0000 (16:26 -0400)
commite4a41f162b61f3a6f807df63e9de4a208eb32f5c
treeb02b0a6ecd8e9ed1caf92c620608edb6ca0de88f
parentd609ceaa850daa597dcfbd88e815e1741bc96a01
parent67b78397b54722f075aff908d55b66081a96fbba
Merge tag 'v1.0.36' into develop

updated to 1.0.36