Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Tue, 16 Apr 2013 08:36:13 +0000 (10:36 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Tue, 16 Apr 2013 08:36:13 +0000 (10:36 +0200)

Trivial merge