From: Erik Andresen <erik@vontaene.de>
Date: Fri, 14 Aug 2015 01:52:35 +0000 (+0000)
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=a4e84ce5a9d3245334956b761e319f9f52ee162f;hp=-c

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

a4e84ce5a9d3245334956b761e319f9f52ee162f