Merge branch 'master' of jas@git.sv.gnu.org:/srv/git/gnutls
authorSimon Josefsson <simon@josefsson.org>
Thu, 16 Apr 2009 19:32:31 +0000 (21:32 +0200)
committerSimon Josefsson <simon@josefsson.org>
Thu, 16 Apr 2009 19:32:31 +0000 (21:32 +0200)
commit480bf83cdbaa937095c8df9b1f2339420ca8fb73
tree5867c76f9713a0e81e4c8915feffecdfa92b6ad4
parentabf893d0c6b875ade04501da8eccccfb43c8ebd9
parent934102c33ac89ace9a1e1d02047d54f2fea6b59b
Merge branch 'master' of jas@git.sv.gnu.org:/srv/git/gnutls