Merge branch 'master' of ssh://vontaene/home/erik_alt/git/ros_wild_thumper
authorErik Andresen <erik@vontaene.de>
Fri, 5 Jun 2015 17:23:14 +0000 (17:23 +0000)
committerErik Andresen <erik@vontaene.de>
Fri, 5 Jun 2015 17:23:14 +0000 (17:23 +0000)

Trivial merge