From: Andreas Unterkircher <unki@netshadow.at>
Date: Tue, 13 May 2008 17:33:09 +0000 (+0200)
Subject: Merge branch 'friendlyurl'
X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=commitdiff_plain;h=112916d4ffcc59590b3fd8753ea832c171167751;hp=-c

Merge branch 'friendlyurl'
---

112916d4ffcc59590b3fd8753ea832c171167751