Merge branch 'master' of ssh://git-grichardson@lx-office.linet-services.de/~/lx-offic...
authorG. Richardson <information@lx-office-hosting.de>
Mon, 15 Feb 2010 08:39:59 +0000 (09:39 +0100)
committerG. Richardson <information@lx-office-hosting.de>
Mon, 15 Feb 2010 08:39:59 +0000 (09:39 +0100)

Trivial merge