Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 25 Feb 2013 08:31:50 +0000 (09:31 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 25 Feb 2013 08:31:50 +0000 (09:31 +0100)

Trivial merge