Thomas Tanghus 7aa8eb3427 Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup ... Conflicts: apps/contacts/ajax/deletebook.php apps/contacts/index.php		2011-12-09 15:25:26 +01:00
..
addressbook.php	Various fixes to multiple address books handling	2011-12-09 15:10:51 +01:00
app.php	Contacts: refactor common ajax functions to OC_Contacts_App	2011-12-07 20:40:59 +01:00
connector_sabre.php	Split OC_Contacts_Addressbook in _Addressbook and _VCard	2011-09-17 00:26:57 +02:00
hooks.php	Various fixes to multiple address books handling	2011-12-09 15:10:51 +01:00
vcard.php	Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup	2011-12-09 15:25:26 +01:00