The following commit has been merged in the master branch: commit 9e80af2abed0a82794acfc1a58725b9090ca7980 Merge: 4d30670880c84071dba4b220f595e64d6c01d1ba 28f9e0e2b9ef07f741f62c93622ad214964f2041 Author: Marek Lindner lindner_marek@yahoo.de Date: Wed Jun 8 13:16:19 2011 +0200

Merge branch 'master' of git+ssh://batman-git/batman-adv