From: SuperBFG7 <daniel@despite.ch>
Date: Thu, 22 Oct 2015 09:21:09 +0000 (+0200)
Subject: Merge branch 'local_play'
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=8696216d6e1b4993b538df4c7db4b65ab64a4d31;p=ympd.git

Merge branch 'local_play'
---

8696216d6e1b4993b538df4c7db4b65ab64a4d31