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

Trivial merge