Merge branch 'master' into chavo chavo
authorAleksandar Stojiljkovic <aleksandar.stojiljkovic@nokia.com>
Fri, 16 Apr 2010 10:38:29 +0000 (13:38 +0300)
committerAleksandar Stojiljkovic <aleksandar.stojiljkovic@nokia.com>
Fri, 16 Apr 2010 10:38:29 +0000 (13:38 +0300)
commit1198691f728df925731e2c3a2c64215920f61956
tree6c4fda344c1a0404d2dfc0938155907b6fed76ae
parent5756fcb22c86995076d9ee246edc15d3c6e3053c
parent652c82ae73df244fde661430e5b5c679d4a1a1ef
Merge branch 'master' into chavo

Conflicts:
debian/changelog
src/requests/contactfetchrequest.cpp
src/requests/contactfetchrequest.h
src/requests/contactidfetchrequest.cpp
src/requests/contactremoverequest2.h
src/requests/contactfetchrequest.cpp
src/requests/contactfetchrequest.h
src/requests/contactsaverequest.cpp