Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorThomas Heck <theck@linet-services.de>
Mon, 22 Apr 2013 13:02:51 +0000 (15:02 +0200)
committerThomas Heck <theck@linet-services.de>
Mon, 22 Apr 2013 13:02:51 +0000 (15:02 +0200)

Trivial merge