[commits] batman; test conversation; branch, master, updated. 84f5b39ce5c463cc2312eb4a8cd94234d841c054

The following commit has been merged in the master branch: commit 3b4ae777ea8311c5d883f277a4e2cb91e088558d Author: Marek Lindner lindner_marek@yahoo.de Date: Mon Nov 6 20:42:13 2006 +0100

changelog updated

diff --git a/CHANGELOG b/CHANGELOG index f42328e..b429702 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -22,6 +22,7 @@ new functions: - Network announcement implemented - daemonizing batman -> batmand - improving output / logging to syslog added +- neighbours and gateways can be listed - FreeBSD support added - Mac OS X support added