From: NurPech <nurpech@nurpech.de>
Date: Mon, 20 May 2013 18:53:06 +0000 (+0200)
Subject: Merge branch 'master' of ssh://gitosis@git.pk910.de:16110/srvx.git
X-Git-Url: http://git.pk910.de/?p=srvx.git;a=commitdiff_plain;h=652c3f9f94dbe20e4c138914f10f6c2ee1da6dfa

Merge branch 'master' of ssh://gitosis@git.pk910.de:16110/srvx.git
---

652c3f9f94dbe20e4c138914f10f6c2ee1da6dfa