Merge branch 'stable' of git://193.238.157.30/olsrd into stable
authorHenning Rogge <hrogge@googlemail.com>
Mon, 1 Mar 2010 19:23:31 +0000 (20:23 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Mon, 1 Mar 2010 19:23:31 +0000 (20:23 +0100)
commit81d512d391f2c277516c7a8c4c1091f279e3cfab
tree0a09542a9a1383566618c11078daff6887d6cb76
parent04ac2bee78925cf533134f3bf373804dcd2d0c3b
parent3d72440eef038e0ef3ca80aa907c072b74621e86
Merge branch 'stable' of git://193.238.157.30/olsrd into stable