Merge branch 'master' of git://olsr.org/framework
authorHenning Rogge <hrogge@googlemail.com>
Tue, 20 Mar 2012 18:07:30 +0000 (19:07 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Tue, 20 Mar 2012 18:07:30 +0000 (19:07 +0100)
commitb442ba211ee53185f56f3aa85746efb9c44b4440
treebd06db0b3cd07d58edad765a8988042a86f3fb9e
parent4943de517204ebb88972b7fd186ffa8b3e74c936
parent368d8b74c9c51b977d9e7a7dadc86793fe091c11
Merge branch 'master' of git://olsr.org/framework