Merge branch 'gpg4win-2'
authorAndre Heinecke <aheinecke@intevation.de>
Thu, 26 Nov 2015 08:32:11 +0000 (19:02 +1030)
committerAndre Heinecke <aheinecke@intevation.de>
Thu, 26 Nov 2015 08:32:11 +0000 (19:02 +1030)
commit8bf10e2ff49add53725413e7ba208d6aa96776af
tree88b83920ad6296f091e69631a0fa08655d64dc98
parentcfa1a2d031fd72fb2c354a714df50521ca0e5fd0
parent796f40c89883b30a902172bdc132538ad6c810d3
Merge branch 'gpg4win-2'

Conflicts:
Makefile.am
NEWS
configure.ac
packages/packages.current
src/Makefile.am
NEWS
packages/packages.current
src/installer.nsi