Merge remote branch 'contacts-master/master'
authorHoria Popa <horia.popa@movial.com>
Wed, 22 Jun 2011 09:43:11 +0000 (12:43 +0300)
committerHoria Popa <horia.popa@movial.com>
Wed, 22 Jun 2011 09:43:11 +0000 (12:43 +0300)
commitdeed5d558b6099bc7f55d9267b2c409988800030
treebdd6d205b985d6d3d11d183fa21ccfac52814c89
parentd4458f3ade6b835ecfdbbf30c1ebe1eee41b14ec
parent3a6f00fbd089f41173f03c4d7b3ad30713c6be5c
Merge remote branch 'contacts-master/master'

Conflicts:
AddressEditWidget.qml
ContactsExpandableDetails.qml
EditViewPortrait.qml
NewContactViewPortrait.qml
AddressEditWidget.qml
ContactsExpandableDetails.qml
DetailViewPortrait.qml
EditViewPortrait.qml
GroupedViewLandscape.qml
GroupedViewPortrait.qml
ImEditWidget.qml
NewContactViewPortrait.qml
WebPageEditWidget.qml
main.qml