Merge branch 'master' of git@gitorious.org:qtcontacts-tracker/contactsd
authorAleksandar Stojiljkovic <aleksandar.stojiljkovic@nokia.com>
Fri, 13 Aug 2010 11:33:59 +0000 (14:33 +0300)
committerAleksandar Stojiljkovic <aleksandar.stojiljkovic@nokia.com>
Fri, 13 Aug 2010 11:33:59 +0000 (14:33 +0300)
commitb4f3697ab0efd080485d5ae6d7c11ba7f3b71600
tree447612fd02abd9c16974e5e87aae24190f88b6aa
parenta5d7a80e313b79911d1f618a69c3c3b1a483e85f
parent6f0eac020ed5ecb2d40263df2526d90a80861b98
Merge branch 'master' of git@gitorious.org:qtcontacts-tracker/contactsd
plugins/telepathy/trackersink.cpp