Merge branch 'release/1.2.0'
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 25 Jul 2016 20:55:21 +0000 (16:55 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 25 Jul 2016 20:55:21 +0000 (16:55 -0400)
commit49d8ec681bc309ae57d90986223978f5bcf2263d
treefa7b084b92e7bac8f4daa9c0728005400a25ca00
parenta261cda042c5b09838e5b8cd089f66eb72be859a
parent34fa88258ff21e4736ca48f9d9d20d5bb6128a92
Merge branch 'release/1.2.0'