Merge branch 'release/2.5.0' v2.5.0
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 12 Aug 2016 17:46:45 +0000 (13:46 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 12 Aug 2016 17:46:45 +0000 (13:46 -0400)
commit6072c64585c4bccc78f8239b80c71320812ec90a
tree469708de6cc8e9257e9766791a795c248a4e81b9
parent0b78ce2b528a3a9071b7e7556dae187852c3a69d
parentb0c41858545c16aa3be2ecc29c9595d1cee6903c
Merge branch 'release/2.5.0'