Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Tue, 7 Jan 2014 14:23:38 +0000 (15:23 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Tue, 7 Jan 2014 14:23:38 +0000 (15:23 +0100)

Trivial merge