Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Thu, 30 Oct 2014 12:50:32 +0000 (13:50 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Thu, 30 Oct 2014 12:50:32 +0000 (13:50 +0100)

Trivial merge