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

Trivial merge