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

Merge branch 'devel'
---

b1eac5f578ef049e43a62f1c8d4bbc8f3527db22