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

Trivial merge