From: Benni Bärmann <benni@obda.de>
Date: Wed, 5 Sep 2012 20:34:28 +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=edbdf981639e5bc7d16a8ccd7e59ce2cf71bd142;hp=edbdf981639e5bc7d16a8ccd7e59ce2cf71bd142;ds=sidebyside

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