From: Benni Bärmann <benni@obda.de>
Date: Sun, 23 Sep 2012 10:27:54 +0000 (+0200)
Subject: Merge branch 'master' of aymargeddon.de:/var/cache/git/aymargeddon/current
X-Git-Url: http://aymargeddon.de/gitweb/?p=aymargeddon%2Fcurrent.git;a=commitdiff_plain;h=05176fd6f49774b1ce2e785e220b534e436fcab2;hp=05176fd6f49774b1ce2e785e220b534e436fcab2

Merge branch 'master' of aymargeddon.de:/var/cache/git/aymargeddon/current
---