Merge branch 'master' into bmx6_testing
authorAxel Neumann <neumann@cgws.de>
Sat, 17 Aug 2013 12:22:04 +0000 (14:22 +0200)
committerAxel Neumann <neumann@cgws.de>
Sat, 17 Aug 2013 12:22:04 +0000 (14:22 +0200)
commit13f0c9deacfb85587857a3eccbe4ad2de39f74c1
tree904f35c63e4814b1f58a43112455bf20816c97d1
parente61aebe3581d68eb3576e99d8237d5c180a68789
parent60296fff418fa473394e4c5187c2072b9b47d2e8
Merge branch 'master' into bmx6_testing

Conflicts:
bmx6/Makefile