olsrd: merge r27914, r29065, r29131, r29134, r29135, r29172
authorJo-Philipp Wich <[email protected]>
Sun, 5 Feb 2012 15:45:51 +0000 (15:45 +0000)
committerJo-Philipp Wich <[email protected]>
Sun, 5 Feb 2012 15:45:51 +0000 (15:45 +0000)
commit63f75cda35dde778a4f6226a990bd3c49f2f0f66
tree98c5afc3a1d70c016f5103300913ef3145e7d5db
parent5a253901691af2fb8bb1df5c2c7bb83f1bd13377
olsrd: merge r27914, r29065, r29131, r29134, r29135, r29172

SVN-Revision: 30231
net/olsrd/Makefile
net/olsrd/files/olsrd.init
net/olsrd/patches/200-txtinfo_gateways_formatting.patch [deleted file]