Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorThomas Heck <theck@linet-services.de>
Mon, 22 Jul 2013 16:24:53 +0000 (18:24 +0200)
committerThomas Heck <theck@linet-services.de>
Mon, 22 Jul 2013 16:24:53 +0000 (18:24 +0200)

Trivial merge