into branch 'master'.
Fix Bug 291197 - %OFROMNAME in template uses incorrect encoding
FIXED-IN: 4.8.1
M +6-6templateparser/templateparser.cpp
http://commits.kde.org/kdepim/b326d182a72f1205886a45fa44756bacac37e5e1
--
Configure bugmail: https://bugs.kde.org/userprefs.cgi?tab=email
--- You
- %OFROMNAME in template uses incorrect encoding
FIXED-IN: 4.8.1
(cherry picked from commit b326d182a72f1205886a45fa44756bacac37e5e1)
Conflicts:
templateparser/templateparser.cpp
M +6-3templateparser/templateparser.cpp
http://commits.kde.org/kdepim/30007a92bb31a460aab6058b1aa9cead036c13e1