Merge branch 'release/1.2.22' v1.2.22
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 13 Apr 2017 17:40:15 +0000 (13:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 13 Apr 2017 17:40:15 +0000 (13:40 -0400)
commitecf2d1f1387af994afad60c95c887f674f9eca8b
treec58d7dfeb346f42fb4a2983f7e23350fb8c36161
parent30b76125ec386cb0ed93c9cdf6bc1aebd2495759
parente59113abe30ec2548e2fdc3940ae3853e1c87bba
Merge branch 'release/1.2.22'