Merge branch 'master' of ssh://git-grichardson@lx-office.linet-services.de/~/lx-offic...
authorG. Richardson <information@lx-office-hosting.de>
Fri, 5 Mar 2010 09:29:12 +0000 (10:29 +0100)
committerG. Richardson <information@lx-office-hosting.de>
Fri, 5 Mar 2010 09:29:12 +0000 (10:29 +0100)

Trivial merge