From: Florian Forster <octo@verplant.org>
Date: Tue, 16 Jul 2013 10:13:46 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: v1.0.1^0
X-Git-Url: https://git.octo.it/?p=statsd-tg.git;a=commitdiff_plain;h=fb0ff4b1a74be397ed54b39db1559e04d6b38408

Merge remote-tracking branch 'origin/master'
---

fb0ff4b1a74be397ed54b39db1559e04d6b38408