From: Erik Andresen <erik@vontaene.de>
Date: Sat, 11 Jul 2015 17:47:48 +0000 (+0200)
Subject: Merge branch 'master' of ssh://vontaene/home/erik_alt/git/ros_wild_thumper
X-Git-Url: https://defiant.homedns.org/gitweb/?p=ros_wild_thumper.git;a=commitdiff_plain;h=860e5f83d540d60b46f4a0f242f007dfd1c0747d;hp=-c

Merge branch 'master' of ssh://vontaene/home/erik_alt/git/ros_wild_thumper
---

860e5f83d540d60b46f4a0f242f007dfd1c0747d