From: Christian Weiske <cweiske@cweiske.de>
Date: Wed, 19 Sep 2012 17:09:10 +0000 (+0200)
Subject: Merge branch 'master' into remotefork
X-Git-Tag: v0.3.0~32^2~5
X-Git-Url: https://git.cweiske.de/phorkie.git/commitdiff_plain/11c020441ee7ddf53fcaec4250c0a408fa18d0be?hp=-c

Merge branch 'master' into remotefork
---

11c020441ee7ddf53fcaec4250c0a408fa18d0be