Merge branch 'master' into rb-wiederkehrende-rechnungen
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 17 Jan 2011 11:45:13 +0000 (12:45 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 17 Jan 2011 11:45:13 +0000 (12:45 +0100)

Trivial merge