Merge branch 'master' into conference

b326647a · Alexandre Savard · a7bed668 · 63f7db1c · b326647a · b326647a
Commit b326647a authored 15 years ago by Alexandre Savard
--- a/lang/zh_CN/sflphone.po
+++ b/lang/zh_CN/sflphone.po
--- a/lang/zh_HK/sflphone.po
+++ b/lang/zh_HK/sflphone.po
--- a/lang/zh_TW/zh_TW.po
+++ b/lang/zh_TW/zh_TW.po
--- a/sflphone-client-gnome/src/icons/Makefile
+++ b/sflphone-client-gnome/src/icons/Makefile