Merge branch 'master' of git://repo.or.cz/contacts_plasmoid
commitfbdf48bb7f8cf09201a9daf803adeb897e4baea6
authorAdenilson Cavalcanti <adenilson@macblack.(none)>
Tue, 4 Aug 2009 15:44:44 +0000 (4 11:44 -0400)
committerAdenilson Cavalcanti <adenilson@macblack.(none)>
Tue, 4 Aug 2009 15:44:44 +0000 (4 11:44 -0400)
tree1715d1e739bc61fcf1967c0bf802090e6e410f14
parentce51dad46efb2dd9a372593a9b46f5d35dc5252a
parent9f4c8d0194514c75baec2e552aae374a2117806a
Merge branch 'master' of git://repo.or.cz/contacts_plasmoid
contacts.cpp