Merge branch 'master' of /var/cache/git/phpfspot
authorAndreas Unterkircher <unki@netshadow.at>
Fri, 25 Apr 2008 18:02:07 +0000 (20:02 +0200)
committerAndreas Unterkircher <unki@netshadow.at>
Fri, 25 Apr 2008 18:02:07 +0000 (20:02 +0200)

Trivial merge