Merge branch 'master' into ueno-pss
authorWerner Koch <wk@gnupg.org>
Thu, 9 Jun 2011 07:05:15 +0000 (09:05 +0200)
committerWerner Koch <wk@gnupg.org>
Thu, 9 Jun 2011 07:05:15 +0000 (09:05 +0200)
commit3762d82871a0fc84f13e6dffffcff0513dd248c0
treead75061e3a10ddbabfd72f2eeaad285a7d0e633e
parent9d7628939af5d8fbfea69f91c8b02aea0f9d4744
parent41811f6d8b93f32b5e3cc04ae3ad921a6c0aedc8
Merge branch 'master' into ueno-pss

Solved conflicts:
cipher/ChangeLog
cipher/pubkey.c
tests/ChangeLog
tests/basic.c
cipher/ChangeLog
cipher/pubkey.c
tests/ChangeLog
tests/basic.c