Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Mon, 16 Dec 2013 13:04:49 +0000 (14:04 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Mon, 16 Dec 2013 13:04:49 +0000 (14:04 +0100)

Trivial merge