856a5fd4 Merge tag 'v2.21.0' into debian/unstable a4f6ab7e Merge corrections on version number. -- Charles Plessy <plessy@debian.org> Tue, 23 Sep 2014 18:48:17 +0900