Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorThomas Heck <theck@linet-services.de>
Wed, 16 Oct 2013 15:14:19 +0000 (17:14 +0200)
committerThomas Heck <theck@linet-services.de>
Wed, 16 Oct 2013 15:14:19 +0000 (17:14 +0200)

Trivial merge