Overwrote with the olsrd.conf file from commotionwireless.net.

Signed-off-by: The Doctor <drwho@virtadpt.net>
Merge branch 'master' of https://github.com/Byzantium/Byzantium

Conflicts:
	porteus/olsrd/olsrd.conf