Merge branch 'master' into gnutls
commit46b006a86e07726d75905c58efe1edcd9a9a61e3
authorBen Kibbey <bjk@luxsci.net>
Sun, 14 Sep 2008 01:36:05 +0000 (13 21:36 -0400)
committerBen Kibbey <bjk@luxsci.net>
Sun, 14 Sep 2008 01:36:05 +0000 (13 21:36 -0400)
tree4376106414650bd15ba9919fc287e5c4e3d367da
parent6783b83ddf4d3483afaa62cec9110b2a140f9fc9
parentc22172619d4ba320e3de742368e562ac8461983b
Merge branch 'master' into gnutls
configure.ac