Merge branch 'stable' of git://193.238.157.30/olsrd into stable
authorHenning Rogge <hrogge@googlemail.com>
Mon, 29 Nov 2010 16:45:37 +0000 (17:45 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Mon, 29 Nov 2010 16:45:37 +0000 (17:45 +0100)
commit6e5216b32c971356e0cf6fb7b1be78f4eb1deaf1
treea131a32158b8ae17e1e2f5bfea5516e8aff1dccf
parent22f6891260a7c29d00c0a969359e43d0f125f119
parent3ed151bd53db9575fb3054cd7212db9e11a4524a
Merge branch 'stable' of git://193.238.157.30/olsrd into stable