Merge branch 'stable' of git://193.238.157.30/olsrd into stable
authorHenning Rogge <hrogge@googlemail.com>
Thu, 3 Feb 2011 18:20:06 +0000 (19:20 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Thu, 3 Feb 2011 18:20:06 +0000 (19:20 +0100)
commit2a5bdb330fd856d1c7873a1d1f1cde3e5b87174a
tree3a82d217db0bf33a2dcb13d394fc8df456620440
parent662ac68855a99e8334a74258f78a66b20eae5302
parent2eaec83bf17267eb5f34610962446616e3715c11
Merge branch 'stable' of git://193.238.157.30/olsrd into stable