From 16aa852c53f8ba5f5e4d0a67377adee4d362230f Mon Sep 17 00:00:00 2001
From: tumbili <bapstr@ethz.ch>
Date: Wed, 18 Nov 2015 16:01:53 +0100
Subject: [PATCH] merged master into sitl_gazebo

---
 Tools/sitl_gazebo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tools/sitl_gazebo b/Tools/sitl_gazebo
index d7b4fcfabd..7a2e18e786 160000
--- a/Tools/sitl_gazebo
+++ b/Tools/sitl_gazebo
@@ -1 +1 @@
-Subproject commit d7b4fcfabde7d770cf0bf50287836d943eaf6714
+Subproject commit 7a2e18e7869e7d7c47ac7a97d956a64751429140