[Pkg-gnupg-commit] [gnupg2] 03/159: Merge branch 'STABLE-BRANCH-2-2' into wk-master

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 30af06ee94d670fbc9dc08865e763c3446636185
Merge: 762fcc0 df1e0d2
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Dec 4 12:11:56 2015 +0100

    Merge branch 'STABLE-BRANCH-2-2' into wk-master
    
    --
    
    I forgot to merge the updated Japanese translation into the release
    branch thus we need to fix it up here.

 NEWS         |  10 ++--
 configure.ac |   2 +-
 po/ru.po     | 156 ++++++++++++++++++++++++++++-------------------------------
 po/uk.po     | 143 +++++++++++++++++++++++-------------------------------
 4 files changed, 142 insertions(+), 169 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git