1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Marcus Brinkmann 0868997e18 Merge branch 'master' into npth
Conflicts:
	ChangeLog-2011
	Makefile.am
	agent/ChangeLog-2011
	agent/gpg-agent.c
	dirmngr/ChangeLog-2011
	dirmngr/dirmngr.c
	doc/HACKING
	g13/g13.c
	po/de.po
	scd/ChangeLog-2011
	scd/apdu.c
	scd/command.c
	scd/scdaemon.c
	scripts/gitlog-to-changelog
	tools/ChangeLog-2011
2012-01-03 18:13:19 +01:00
..
2010-12-14 19:17:58 +00:00
2011-10-13 17:09:29 +02:00
2010-07-23 16:16:14 +00:00
2011-10-13 17:09:29 +02:00
2012-01-03 18:13:19 +01:00
2010-06-09 16:53:51 +00:00
2011-10-13 17:09:29 +02:00
2011-10-13 17:09:29 +02:00
2011-12-02 21:57:32 +01:00
2011-02-04 12:57:53 +01:00
2011-02-04 12:57:53 +01:00
2010-06-09 16:53:51 +00:00
2011-02-04 12:57:53 +01:00
2010-06-09 16:53:51 +00:00