merge

clients_icons/clients_icons.py

@@ -33,6 +33,7 @@ clients = {
     'http://oneteam.im/caps': 'oneteamiphone.png',
     'http://tkabber.jabber.ru/': 'tkabber.png',
     'http://pidgin.im/': 'pidgin.png',
+    'http://pidgin.im/caps': 'pidgin.png',
     'http://qutim.org': 'qutim.png',
     'http://qutim.org/': 'qutim.png',
     'http://exodus.jabberstudio.org/caps': 'exodus.png',

clients_icons/manifest.ini

@@ -1,7 +1,7 @@
 [info]
 name: Clients icons
 short_name: clients_icons
-version: 0.7
+version: 0.8
 description: Shows the client icons in the roster
  and in groupchats.
  Depends: Gajim > r12506