Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gpgme
authorWerner Koch <wk@gnupg.org>
Thu, 3 Feb 2011 19:51:36 +0000 (20:51 +0100)
committerWerner Koch <wk@gnupg.org>
Thu, 3 Feb 2011 19:51:36 +0000 (20:51 +0100)
commitb001a8df68c8eb33abbe879f6c7fb4db4909b6f6
tree800d5a8dba5aeaf953c50ede3c10669b8ef48cf2
parent55ad4d80e278e56bd5bc4fbac837db34edd70bde
parent2bdbe888228ce09f15be4773800ed13263a8e43e
Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gpgme
src/ChangeLog