Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Sun, 8 Jan 2017 12:42:26 +0000 (08:42 -0400)
committerDavid Bremner <david@tethera.net>
Sun, 8 Jan 2017 12:42:26 +0000 (08:42 -0400)
These are the (tentative) changes for 0.23.5

1  2 
configure
doc/conf.py

diff --cc configure
Simple merge
diff --cc doc/conf.py
Simple merge