From: Erik Andresen <erik@vontaene.de>
Date: Fri, 18 Nov 2016 20:15:38 +0000 (+0100)
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=cc73472b4a28a4ea6a97d96621b3ca260be01098;hp=-c

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

cc73472b4a28a4ea6a97d96621b3ca260be01098