Merge with tip.
authorTobias Markmann <tm@ayena.de>
Fri, 12 Mar 2010 17:41:05 +0000 (18:41 +0100)
committerTobias Markmann <tm@ayena.de>
Fri, 12 Mar 2010 17:41:05 +0000 (18:41 +0100)
commit25ad747ba1e296a10613b78abf5644ea3e959be0
tree9dd7b38690fed8b235977def984797ba62ac50c7
parentd2fd8a30a87b65a58981a3fae15a135b7368aa70
parentdd661dc4697f870af6639fce344e12e8daec7d0e
Merge with tip.
net/server_select.lua
util/sasl.lua