Merge branch 'hotfix/2.1.1' v2.1.1
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 15 Jun 2016 16:02:18 +0000 (12:02 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 15 Jun 2016 16:02:18 +0000 (12:02 -0400)
commit964b20e5c00bcb74b394275760002d7be23ac272
treefcde70742c703d8a2d7a56a10c407b10d8272c08
parent624f0ae1eb964bb6b75e855ffa5ad97e77a878cc
parent3d9207884652c2ca58666d9411d1e9287aa8bcce
Merge branch 'hotfix/2.1.1'