Merge branch 'master' of git://olsr.org/olsrd
authorHenning Rogge <hrogge@googlemail.com>
Tue, 23 Mar 2010 20:28:35 +0000 (21:28 +0100)
committerHenning Rogge <hrogge@googlemail.com>
Tue, 23 Mar 2010 20:28:35 +0000 (21:28 +0100)
commitacea70ad10df1da5cd88c10a11cac3774f289c31
treef6b23cf39eda79b59999476a3270d6f2ca41180c
parent7eea9ca965c9f257a1f7c3f865d8f32e625cd270
parent4e12fa51da207f2e2c90cb90333a3d58ac8f5cc2
Merge branch 'master' of git://olsr.org/olsrd