Merge branch 'master' of ssh://vontaene/home/erik_alt/git/ros_wild_thumper
authorErik Andresen <erik@vontaene.de>
Fri, 18 Nov 2016 20:15:38 +0000 (21:15 +0100)
committerErik Andresen <erik@vontaene.de>
Fri, 18 Nov 2016 20:15:38 +0000 (21:15 +0100)

Trivial merge