Merge branch 'release/1.2' v1.2
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 11 May 2016 14:12:59 +0000 (10:12 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 11 May 2016 14:12:59 +0000 (10:12 -0400)
commit3d9211005d38766bac80e462355bf86857b52b89
treebb7d65d85eef4f65f3f67069f868ee4e5c9743f0
parent5f6be60b01c490061aea5b1e96994ea7ea61eb04
parent882d2101a1fc7cdfb7492ec63797e3dc9f4782bf
Merge branch 'release/1.2'