Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Thu, 27 Jun 2013 14:29:25 +0000 (16:29 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Thu, 27 Jun 2013 14:29:25 +0000 (16:29 +0200)

Trivial merge