From: Christian Weiske <cweiske@cweiske.de>
Date: Wed, 19 Sep 2012 17:12:07 +0000 (+0200)
Subject: Merge branch 'master' into remotefork
X-Git-Tag: v0.3.0~32^2~4
X-Git-Url: https://git.cweiske.de/phorkie.git/commitdiff_plain/e8151ad24cb9f4951ea1f29f5878248e584b8372

Merge branch 'master' into remotefork
---

e8151ad24cb9f4951ea1f29f5878248e584b8372