From: Andreas Unterkircher <unki@netshadow.at>
Date: Sat, 12 Apr 2008 17:33:51 +0000 (+0200)
Subject: Merge commit 'origin/master' into nefformat
X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5aacb6d86fa943c66ee94eb603887bb40e034ec5;p=phpfspot.git

Merge commit 'origin/master' into nefformat
---

5aacb6d86fa943c66ee94eb603887bb40e034ec5