Merge branch 'release/1.2.20' v1.2.20
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Jul 2016 17:41:27 +0000 (13:41 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Jul 2016 17:41:27 +0000 (13:41 -0400)
commit4d31e8f325b434b99d1de97b5799e7c4c918d43a
treee3964ab6713137786cefb533e831e0cddcfc12ef
parenta2ce93a47dff5510712f2e20e94631ac83dc34b9
parent5dfa24053eaebfd100c6f8fb28e9bebb48771323
Merge branch 'release/1.2.20'