Merge branch 'master' of ssh://vontaene/home/erik_alt/git/ros_wild_thumper
authorErik Andresen <erik@vontaene.de>
Fri, 14 Aug 2015 01:52:35 +0000 (01:52 +0000)
committerErik Andresen <erik@vontaene.de>
Fri, 14 Aug 2015 01:52:35 +0000 (01:52 +0000)

Trivial merge