Merge branch 'master' of ssh://vontaene/home/erik_alt/git/ros_wild_thumper
authorErik Andresen <erik@vontaene.de>
Sun, 31 May 2015 09:54:18 +0000 (11:54 +0200)
committerErik Andresen <erik@vontaene.de>
Sun, 31 May 2015 09:54:18 +0000 (11:54 +0200)

Trivial merge