Merge branch 'release/2.9.6' v2.9.6
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Feb 2017 16:48:50 +0000 (11:48 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Feb 2017 16:48:50 +0000 (11:48 -0500)
commit877c2c0feef7dd41bf09e5d7f5c77a30ab58031c
tree8344c8647db0a7732abd6b42028f91df8edfd2e8
parent68f2e0a40da958cb0a16f14c5666f49ca5cb75f2
parenta2cfe1a9cf52f87015a3889ef548bc6941367c1f
Merge branch 'release/2.9.6'