Merge branch 'master' of git://repo.or.cz/contacts_plasmoid
commit5695e569cf75ac594986096b97e70962ecd51a69
authorAdenilson Cavalcanti <adenilson@macblack.(none)>
Tue, 11 Aug 2009 20:20:00 +0000 (11 16:20 -0400)
committerAdenilson Cavalcanti <adenilson@macblack.(none)>
Tue, 11 Aug 2009 20:20:00 +0000 (11 16:20 -0400)
tree0ba07db1a67858d96f41a24da155e43a21a7a313
parent8924ebaa2407982d6ae0b3028559fd24e9616293
parent27b6c748a7cd14179a0681be254ee51c98da3c1e
Merge branch 'master' of git://repo.or.cz/contacts_plasmoid
contacts.cpp