Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Mon, 13 Jan 2014 16:20:22 +0000 (17:20 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Mon, 13 Jan 2014 16:20:22 +0000 (17:20 +0100)

Trivial merge