Merge branch 'master' of ssh://vontaene/home/erik_alt/git/ros_wild_thumper
authorErik Andresen <erik@vontaene.de>
Sat, 11 Jul 2015 17:47:48 +0000 (19:47 +0200)
committerErik Andresen <erik@vontaene.de>
Sat, 11 Jul 2015 17:47:48 +0000 (19:47 +0200)

Trivial merge