Merge branch 'master' of /var/cache/git/phpfspot
authorAndreas Unterkircher <unki@netshadow.at>
Sun, 30 Dec 2007 12:45:49 +0000 (13:45 +0100)
committerAndreas Unterkircher <unki@netshadow.at>
Sun, 30 Dec 2007 12:45:49 +0000 (13:45 +0100)

Trivial merge