From: Robert Kaiser <kairo@kairo.at>
Date: Sat, 3 Jan 2015 12:54:43 +0000 (+0100)
Subject: Merge branch 'master' of linz:/srv/git/git-kairo
X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=4eb45bd45fc0af3f677ad8a7e3f10cf25bdc2929;hp=1c06e73066c41a305e16f26c7577cac928fe33d8;p=php-utility-classes.git

Merge branch 'master' of linz:/srv/git/git-kairo
---