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

Trivial merge