Merge branch 'release/1.2.1' v1.2.1
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 19 Sep 2016 18:36:21 +0000 (14:36 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 19 Sep 2016 18:36:21 +0000 (14:36 -0400)
commit27a25954533fbfafeda0376cae1d14757f85101f
treeaf7237204bdb7e728de74883006ce702132ab39d
parentdb1fa24f4da1d8a8e2adab21d83ec8095c4f2da2
parent5210ad02d35cc51352fc8f357c19b181e95ae7f6
Merge branch 'release/1.2.1'