Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Mon, 24 Jun 2013 09:28:25 +0000 (11:28 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Mon, 24 Jun 2013 09:28:25 +0000 (11:28 +0200)

Trivial merge