Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Fri, 30 Aug 2013 09:07:34 +0000 (11:07 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Fri, 30 Aug 2013 09:07:34 +0000 (11:07 +0200)

Trivial merge