Merge branch 'hotfix/2.1.4' v2.1.4
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Jun 2016 20:35:16 +0000 (16:35 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Jun 2016 20:35:16 +0000 (16:35 -0400)
commit8957675931b67164552836b7f820754cc226dbd2
tree0dc1cbdebce0741fd214921eb1c8491a43d6ae99
parent54b30f2b6585f8646328d5375fcd2ae1e64dc4b8
parenta62f3d828b62e8d8d1ce8f9c3b47e242ecd082ac
Merge branch 'hotfix/2.1.4'