Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Mon, 6 Jan 2014 15:06:39 +0000 (16:06 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Mon, 6 Jan 2014 15:06:39 +0000 (16:06 +0100)

Trivial merge