Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Fri, 27 Feb 2015 15:50:17 +0000 (16:50 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Fri, 27 Feb 2015 15:50:17 +0000 (16:50 +0100)

Trivial merge