Merge branch 'master' of ssh://drop.maemo.org/git/vicar
Conflicts:
qtc_packaging/debian_harmattan/prerm
qtc_packaging/debian_harmattan/rules
qtc_packaging/debian_harmattan/vicar.aegis
qtc_packaging/debian_harmattan/vicar.substvars
src/data/accounts/vicar.service
src/vicar-config-qml/qml/vicarconfigqml/Library/js/DBUtility.js
src/vicar-daemon/vicar-daemon.pro
src/vicar-lib/cpp/gconfutility.cpp
src/vicar-lib/cpp/gconfutility.h
src/vicar-lib/cpp/logutility.h
src/vicar-lib/cpp/telepathyutility.cpp
src/vicar-lib/vicar-lib.pro
src/vicar-telepathy/cpp/connection.cpp
src/vicar-telepathy/cpp/connectioninterfacerequestsadaptor.cpp
src/vicar-telepathy/cpp/connectionmanager.cpp
src/vicar-telepathy/cpp/main.cpp
src/vicar-telepathy/vicar-telepathy.pro
src/vicar-utils/cpp/main.cpp
- [DH] qtc_packaging/debian_harmattan/manifest.aegis_old
- [DH] qtc_packaging/debian_harmattan/postinst_DONTUSE
- [DH] qtc_packaging/debian_harmattan/postrm
- [DH] qtc_packaging/debian_harmattan/prerm
- [DH] qtc_packaging/debian_harmattan/rules
- [DH] qtc_packaging/debian_harmattan/vicar.aegis
- [DH] qtc_packaging/debian_harmattan/vicar.substvars
- [DH] src/data/accounts/vicar.service
- [DH] src/data/xml/org.sip.connection.properties
- [DH] src/vicar-config-qml/qml/vicarconfigqml/Library/js/DBUtility.js
- [DH] src/vicar-daemon/cpp/callrouter.cpp
- [DH] src/vicar-daemon/vicar-daemon.pro
- [DH] src/vicar-lib/cpp/gconfutility.cpp
- [DH] src/vicar-lib/cpp/gconfutility.h
- [DH] src/vicar-lib/cpp/logutility.h
- [DH] src/vicar-lib/cpp/telepathyutility.cpp
- [DH] src/vicar-lib/vicar-lib.pro
- [DH] src/vicar-telepathy/cpp/connection.cpp
- [DH] src/vicar-telepathy/cpp/connectioninterfacerequestsadaptor.cpp
- [DH] src/vicar-telepathy/cpp/connectionmanager.cpp
- [DH] src/vicar-telepathy/vicar-telepathy.pro
- [DH] src/vicar-utils/cpp/main.cpp
- [DH] welcome