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)
commitc7cfd491f059d2f9da94598612d76f8da37727c8
treeeba54ad7f4e13d3894f4fbfa33c061af3aa65046
parentdfb6cba921a74f1b179947d5d77035a860b3ef32
parent19862ff9a8c5cee8b713beda3b5bf15e2cb15d59
Merge branch 'master' into bmx6_testing

Conflicts:
bmx6/Makefile
olsrd/Makefile
bmx6/Makefile