Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Tue, 13 Jan 2015 16:05:57 +0000 (17:05 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Tue, 13 Jan 2015 16:05:57 +0000 (17:05 +0100)

Trivial merge