From: Andrew Karpow <andy@ndyk.de>
Date: Sun, 20 Sep 2015 14:01:06 +0000 (+0200)
Subject: Merge branch 'Nofre-master'
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=4295d1587446872688fe7fa307e33fbc586bc9bc;p=ympd.git

Merge branch 'Nofre-master'
---

4295d1587446872688fe7fa307e33fbc586bc9bc