Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 4 Feb 2013 10:19:45 +0000 (11:19 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 4 Feb 2013 10:19:45 +0000 (11:19 +0100)

Trivial merge