Merge branch 'gpg4win-2'
authorAndre Heinecke <aheinecke@intevation.de>
Tue, 5 Apr 2016 09:53:39 +0000 (11:53 +0200)
committerAndre Heinecke <aheinecke@intevation.de>
Tue, 5 Apr 2016 09:53:39 +0000 (11:53 +0200)
commit1248c6660ad633cffccbfbb35b3602cb1ebf63ca
tree1fd6cf7f106b8577c61674b35ad350d2e1e8126c
parent81a8b0c293faa86c1313feed784b451f47c8ff11
parent36817b29c9cbf835cca02779fb0f50d21a2969c2
Merge branch 'gpg4win-2'

Conflicts:
NEWS
packages/packages.current
NEWS
packages/packages.current