From: Andreas Unterkircher <unki@netshadow.at>
Date: Sun, 27 Apr 2008 12:20:55 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=commitdiff_plain;h=7e3758cb44cc14bb68c4724849e923741dc9982b

Merge commit 'origin/master'
---

7e3758cb44cc14bb68c4724849e923741dc9982b