Merge branch 'master' of ssh://vontaene/home/erik_alt/git/ros_wild_thumper
authorErik Andresen <erik@vontaene.de>
Fri, 28 Oct 2016 21:05:08 +0000 (23:05 +0200)
committerErik Andresen <erik@vontaene.de>
Fri, 28 Oct 2016 21:05:08 +0000 (23:05 +0200)

Trivial merge