From: Guillaume Pellerin <yomguy@parisson.com>
Date: Wed, 15 Apr 2015 09:18:30 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Tag: 0.9~12
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ba4ab8b9e3296114705075a459f0a8efe4b811b3;p=telecaster-client.git

Merge branch 'dev'

Conflicts:
	telecaster/tools/status.py
---

ba4ab8b9e3296114705075a459f0a8efe4b811b3