Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 10 Dec 2013 14:49:59 +0000 (15:49 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Tue, 10 Dec 2013 14:49:59 +0000 (15:49 +0100)

Trivial merge