Merge branch 'release/2.5.2' v2.5.2
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 23 Aug 2016 17:57:15 +0000 (13:57 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 23 Aug 2016 17:57:15 +0000 (13:57 -0400)
commit70d9ec088df54394e727985c2607f8703c839042
treed7ffaab58714758944d9487bd401d82d862061e2
parentc8fba262cb5dc761a3c96064b1727524cf06ded4
parenta0a2255eaab6d21dd55eefd229b5f0f711621dfd
Merge branch 'release/2.5.2'