Merge branch 'master' into gpg-agent
authorStef Walter <stef@memberwebs.com>
Sat, 12 Jun 2010 22:39:09 +0000 (22:39 +0000)
committerStef Walter <stef@memberwebs.com>
Sat, 12 Jun 2010 22:39:09 +0000 (22:39 +0000)
commit700da1be635fdef02adf9589cf7f5069a1e7ef05
tree302dc245f4da80ebcda2a88b4343cddda19ac734
parent5c742ed54591b74a27e84e4626759d5094b69e1d
parentf6a7ad6643832428f1f30b6aaa67f7439a27a331
Merge branch 'master' into gpg-agent