Merge trunk.
authorAdeodato Simó <dato@net.com.org.es>
Sat, 3 Nov 2007 15:29:48 +0000 (16:29 +0100)
committerAdeodato Simó <dato@net.com.org.es>
Sat, 3 Nov 2007 15:29:48 +0000 (16:29 +0100)
commit9ac09d9f7df6001c5edfb20bf2c44c06bf92dd66
tree593d6e355fe501def8387aa8c30ce37e9dab92d4
parent7788cfaba3eabe44efb7bf416653eedf7870be84
parent1ea33bd21b06dbfb94256b1cde103c4fb56a9fe8
Merge trunk.
NEWS
doc/ctrlproxy_config.5.xml
mods/auto_away.c