Merge branch 'master' into bmx6_testing
authorAxel Neumann <neumann@cgws.de>
Wed, 27 Nov 2013 10:55:52 +0000 (11:55 +0100)
committerAxel Neumann <neumann@cgws.de>
Wed, 27 Nov 2013 10:55:52 +0000 (11:55 +0100)
commitdea7535ffa11b4c7bbc6d57f885433f10adbc4e2
treebc9c8ac1b5021e7d0bdfdff2591389e0dcd478de
parentb115e3e5f94963e2fa4673b6dfd6e3285ced8ecb
parente459ca61d20d14186bd35088d8dc0d7c38962425
Merge branch 'master' into bmx6_testing