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

Trivial merge