Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Tue, 2 Jun 2015 04:37:59 +0000 (06:37 +0200)
committerDavid Bremner <david@tethera.net>
Tue, 2 Jun 2015 04:37:59 +0000 (06:37 +0200)
20.1 plus NEWS fixup

1  2 
NEWS

diff --cc NEWS
Simple merge