From: Christian Weiske <cweiske@cweiske.de>
Date: Fri, 21 Sep 2012 08:33:24 +0000 (+0200)
Subject: Merge branch 'master' into milestone
X-Git-Tag: v0.3.0~32
X-Git-Url: https://git.cweiske.de/phorkie.git/commitdiff_plain/5d065586f4c16c0ec6510dba97b0d5facb859d75

Merge branch 'master' into milestone
---

5d065586f4c16c0ec6510dba97b0d5facb859d75