Merge remote branch 'corristo/master'

This commit is contained in:
Marc Zinnschlag 2012-03-02 12:11:53 +01:00
commit 12b7c6f1ac