Merge branch 'master' into bmx6_testing
authorAxel Neumann <neumann@cgws.de>
Sat, 8 Jun 2013 15:28:57 +0000 (17:28 +0200)
committerAxel Neumann <neumann@cgws.de>
Sat, 8 Jun 2013 15:28:57 +0000 (17:28 +0200)
commite2eec4227c7e62d1f3e9567aaf4a011be2ee36b6
tree77b281591a4a2566e7470e85fae6c96060d3f3b9
parentc7cfd491f059d2f9da94598612d76f8da37727c8
parent9e255f58197e5446b61c4605d67ee6cdd76e22bd
Merge branch 'master' into bmx6_testing

Conflicts:
bmx6/Makefile