Merge branch 'bmx6_testing' into bmx6_testing_new_config
authorAxel Neumann <neumann@cgws.de>
Sun, 4 Aug 2013 06:25:07 +0000 (08:25 +0200)
committerAxel Neumann <neumann@cgws.de>
Sun, 4 Aug 2013 06:25:07 +0000 (08:25 +0200)
Conflicts:
bmx6/Makefile


Trivial merge