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

Trivial merge