Merge branch 'master' into bmx6_testing
authorAxel Neumann <neumann@cgws.de>
Sat, 8 Jun 2013 15:11:15 +0000 (17:11 +0200)
committerAxel Neumann <neumann@cgws.de>
Sat, 8 Jun 2013 15:11:15 +0000 (17:11 +0200)
Conflicts:
bmx6/Makefile
olsrd/Makefile

1  2 
bmx6/Makefile

diff --cc bmx6/Makefile
Simple merge