Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Wed, 8 Jan 2014 11:18:47 +0000 (12:18 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Wed, 8 Jan 2014 11:18:47 +0000 (12:18 +0100)

Trivial merge