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

Trivial merge