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

Trivial merge