Merge branch 'gpg4win-2'
authorAndre Heinecke <aheinecke@intevation.de>
Tue, 5 Apr 2016 09:48:48 +0000 (11:48 +0200)
committerAndre Heinecke <aheinecke@intevation.de>
Tue, 5 Apr 2016 09:48:48 +0000 (11:48 +0200)
commit81a8b0c293faa86c1313feed784b451f47c8ff11
treefddd286bc0e7e18b36a94067f0337fa5e70a489a
parent3988c3b1f9343a837be16e067d69fd31666e875a
parentd79f8129d6fc45926902c673657135c62012df49
Merge branch 'gpg4win-2'

Conflicts:
NEWS
doc/README.de.txt
doc/README.en.txt
packages/packages.current
po/pt.po
src/Makefile.am
src/inst-gpgol.nsi
src/uninst-gpgol.nsi
NEWS
packages/packages.current
po/pt.po
src/Makefile.am