Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorSven Schöling <s.schoeling@linet-services.de>
Thu, 25 Jul 2013 16:28:51 +0000 (18:28 +0200)
committerSven Schöling <s.schoeling@linet-services.de>
Thu, 25 Jul 2013 16:28:51 +0000 (18:28 +0200)

Trivial merge