Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Fri, 24 May 2013 08:28:00 +0000 (10:28 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Fri, 24 May 2013 08:28:00 +0000 (10:28 +0200)

Trivial merge