Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Mon, 29 Jun 2015 09:14:23 +0000 (11:14 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Mon, 29 Jun 2015 09:14:23 +0000 (11:14 +0200)

Trivial merge