Merge branch 'release/2.5.4' v2.5.4
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 30 Aug 2016 17:00:54 +0000 (13:00 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 30 Aug 2016 17:00:54 +0000 (13:00 -0400)
commit8ac38da9db79b155a56d4743c81027f690f2a12b
tree9aa81b24ae96d4ca95f22568044b1e53a4a0c188
parent4e9468bfb9b3ff634e211aa8259263c7391af30a
parent8b44fd64d0faa267dbcac34abc320b6072b476a6
Merge branch 'release/2.5.4'