Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Tue, 14 Oct 2014 17:26:55 +0000 (19:26 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Tue, 14 Oct 2014 17:26:55 +0000 (19:26 +0200)

Trivial merge