Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Fri, 27 Jun 2014 11:48:32 +0000 (13:48 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Fri, 27 Jun 2014 11:48:32 +0000 (13:48 +0200)

Trivial merge