From: Andreas Unterkircher <unki@netshadow.at>
Date: Sun, 20 Jan 2008 15:52:59 +0000 (+0100)
Subject: Merge branch 'devel'
X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e6df6ed675904f2a5a208cb23d771fee43f0bb6;p=phpfspot.git

Merge branch 'devel'
---

7e6df6ed675904f2a5a208cb23d771fee43f0bb6