Merge branch 'hotfix/1.2.2' v1.2.2
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 14:28:21 +0000 (10:28 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 14:28:21 +0000 (10:28 -0400)
commit04a98b93d1ae2b4e36743e8f7fbd4d699c50b077
treef6c64758dc7524efc10bf44e6771c6dcaf878741
parent13b1d5db86dfd1ba44090b4acbd836ee05b51aa7
parent791b0bd4fe35e2dfc562973ed027f5e4d4d87d0f
Merge branch 'hotfix/1.2.2'