Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 7 Jan 2014 08:43:43 +0000 (09:43 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 7 Jan 2014 08:43:43 +0000 (09:43 +0100)

Trivial merge