Merge branch 'release/1.2.1' v1.2.1
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Mar 2016 21:05:30 +0000 (16:05 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Mar 2016 21:05:30 +0000 (16:05 -0500)
commit162d2cfad647815126809503488fe01dc0ca47c3
treec677a5ba3ba531ae5dd2b560310a00e3271a829f
parentbc3b34100c391979e77191c410cc4b5635c83630
parent7ff61a87fe86e3795691c29126ce249600ceef39
Merge branch 'release/1.2.1'