Merge branch 'release/1.0.36' v1.0.36
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 26 Oct 2015 20:26:39 +0000 (16:26 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 26 Oct 2015 20:26:39 +0000 (16:26 -0400)
commit67b78397b54722f075aff908d55b66081a96fbba
treeb02b0a6ecd8e9ed1caf92c620608edb6ca0de88f
parent6e71759f1aa3f5f92dcbf67660eefbc63d8de150
parent2ea5b8ea1fa14830c85359a13845aab8893306a9
Merge branch 'release/1.0.36'