Merge branch 'master' of git://olsr.org/oonf_api
authorHenning Rogge <hrogge@googlemail.com>
Tue, 26 Nov 2013 11:32:41 +0000 (12:32 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Tue, 26 Nov 2013 11:32:41 +0000 (12:32 +0100)

Trivial merge