Merge branch 'master' into gpg-agent
authorStef Walter <stef@memberwebs.com>
Sat, 12 Jun 2010 23:45:33 +0000 (23:45 +0000)
committerStef Walter <stef@memberwebs.com>
Sat, 12 Jun 2010 23:45:33 +0000 (23:45 +0000)
commite167f9b89c58616c7416899f4f43a2c38a51ddd3
tree302dc245f4da80ebcda2a88b4343cddda19ac734
parent700da1be635fdef02adf9589cf7f5069a1e7ef05
parentf6a7ad6643832428f1f30b6aaa67f7439a27a331
Merge branch 'master' into gpg-agent