Merge branch 'release/1.2.0' v1.2.0
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 11 Feb 2016 17:34:29 +0000 (12:34 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 11 Feb 2016 17:34:29 +0000 (12:34 -0500)
commitbc3b34100c391979e77191c410cc4b5635c83630
tree3c3367e83e32f6143a0a565ac169cab1bfad6d58
parentafec174feabb87e55dc82b103d7e5e4e7ba23d28
parent7dd1f5b0d295b378e2d2453e10235ebae5442e6f
Merge branch 'release/1.2.0'