Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Fri, 30 Jan 2015 14:32:28 +0000 (15:32 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Fri, 30 Jan 2015 14:32:28 +0000 (15:32 +0100)

Trivial merge