Merge branch 'master' of http://olsr.org/git/olsrd
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Mon, 22 Oct 2012 13:03:20 +0000 (15:03 +0200)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Mon, 22 Oct 2012 13:03:20 +0000 (15:03 +0200)
commit4752bb980ad9a9fc111103a0da4e7573282c1616
treebde9c39b6ed6825c73fd29e14daddc1994824a12
parent9dabd1d40bde5c65596eca69b4c3f8a082660b03
parent64a07a3310c68695134673eaafc971fdcbd715ad
Merge branch 'master' of http://olsr.org/git/olsrd