1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-23 10:29:58 +01:00
Marcus Brinkmann 36e85416a3 Merge branch 'master' into npth
Conflicts:
	ChangeLog
	common/ChangeLog
2011-10-13 17:18:05 +02:00
..
2011-10-13 17:09:29 +02:00
2010-11-10 12:49:39 +00:00
2011-10-13 17:18:05 +02:00
2011-02-04 12:57:53 +01:00
2011-10-13 17:09:29 +02:00
2011-02-04 12:57:53 +01:00
2011-06-01 21:43:30 +02:00
2011-10-13 17:09:29 +02:00
2011-02-04 12:57:53 +01:00
2011-02-04 12:57:53 +01:00