Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Thu, 4 Sep 2014 07:11:16 +0000 (09:11 +0200)
committerJan Büren <jan@kivitendo-premium.de>
Thu, 4 Sep 2014 07:11:16 +0000 (09:11 +0200)

Trivial merge