Merge branch 'master' of github.com:kivitendo/kivitendo-erp
authorJan Büren <jan@kivitendo-premium.de>
Wed, 29 Jan 2014 12:26:40 +0000 (13:26 +0100)
committerJan Büren <jan@kivitendo-premium.de>
Wed, 29 Jan 2014 12:26:40 +0000 (13:26 +0100)

Trivial merge