Merge branch 'bmx6_testing_new_config' into bmx6_testing
authorAxel Neumann <neumann@cgws.de>
Sat, 17 Aug 2013 11:58:49 +0000 (13:58 +0200)
committerAxel Neumann <neumann@cgws.de>
Sat, 17 Aug 2013 11:58:49 +0000 (13:58 +0200)
commite61aebe3581d68eb3576e99d8237d5c180a68789
tree506eb6a5392a73a9b96f3159c3ea0222414a80cc
parent672a7cfb6f63a1db792bbab09ea36ab7544e6e34
parent21cb637b0f9940d8069057f40ca472b29fa2ffc7
Merge branch 'bmx6_testing_new_config' into bmx6_testing