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

Trivial merge