Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Mon, 13 Apr 2015 15:51:38 +0000 (17:51 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Mon, 13 Apr 2015 15:51:38 +0000 (17:51 +0200)

Trivial merge