personnal settings
Merge branch 'master' of https://github.com/owncloud/contacts
Merge branch 'master' of https://github.com/owncloud/contacts
[tx-robot] updated from transifex
Add mergeFromVCard() method to Contact.

This is to be used on import, if a contact with identical UID exists.
Don't ignore type INTERNET
Give new fields focus. Closes #145
[tx-robot] updated from transifex
[tx-robot] updated from transifex
use new backend prefs
Merge branch 'master' of https://github.com/owncloud/contacts
sorry, typo fixed
Update backend.php

another typo, sry
personalsettings draft
Merge branch 'master' of https://github.com/owncloud/contacts
typo !
[tx-robot] updated from transifex
[tx-robot] updated from transifex
[tx-robot] updated from transifex
[tx-robot] updated from transifex