Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Mon, 30 Mar 2015 12:56:44 +0000 (14:56 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Mon, 30 Mar 2015 12:56:44 +0000 (14:56 +0200)

Trivial merge