<html><head><style type='text/css'>p { margin: 0; }</style></head><body><div style='font-family: verdana,helvetica,sans-serif; font-size: 10pt; color: #000000'><div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font face="arial, helvetica, sans-serif" size="2">Greetings committers, </font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font face="arial, helvetica, sans-serif" size="2"><br></font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font face="arial, helvetica, sans-serif" size="2">I've created the following merge request, please review and let me know what you think. I'm still getting used to Git, so I'm not sure if I did this merge request correctly. At the time of the request this branch was in sync with the master branch apart from my changes to these files:</font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font face="arial, helvetica, sans-serif" size="2"><br></font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font face="arial, helvetica, sans-serif" size="2"> apps/contacts/lib/addressbook.php</font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font face="arial, helvetica, sans-serif" size="2"> apps/contacts/lib/vcard.php</font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font face="arial, helvetica, sans-serif" size="2"><br></font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font face="arial, helvetica, sans-serif" size="2">Thanks,</font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font face="arial, helvetica, sans-serif" size="2">Nathan Anderson</font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font face="arial, helvetica, sans-serif" size="2"><br></font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font face="arial, helvetica, sans-serif" size="2">------------------------------</font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font face="arial, helvetica, sans-serif" size="2"><br></font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font face="arial, helvetica, sans-serif" size="2"><br></font></div></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font face="arial, helvetica, sans-serif" size="2"><a href="https://gitorious.org/owncloud/owncloud/merge_requests/113">https://gitorious.org/owncloud/owncloud/merge_requests/113</a>
</font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font size="2" face="arial, helvetica, sans-serif"><br></font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font size="2" face="arial, helvetica, sans-serif">Add the following hooks to the Contacts application:</font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font size="2" face="arial, helvetica, sans-serif"><br></font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font size="2" face="arial, helvetica, sans-serif">File: apps/contacts/lib/addressbook.php, Class: OC_Contacts_Addressbook</font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font size="2" face="arial, helvetica, sans-serif"> Hook: createAddressbook</font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font size="2" face="arial, helvetica, sans-serif"> Hook: updateAddressbook</font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font size="2" face="arial, helvetica, sans-serif"> Hook: pre_deleteAddressbook</font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font size="2" face="arial, helvetica, sans-serif"> Hook: touchAddressbook</font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font size="2" face="arial, helvetica, sans-serif"><br></font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font size="2" face="arial, helvetica, sans-serif">File: apps/contacts/lib/vcard.php, Class: OC_Contacts_VCard</font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font size="2" face="arial, helvetica, sans-serif"> Hook: createVCard</font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font size="2" face="arial, helvetica, sans-serif"> Hook: updateVCard</font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font size="2" face="arial, helvetica, sans-serif"> Hook: pre_deleteVCard</font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font size="2" face="arial, helvetica, sans-serif"> Hook: moveToAddressbook</font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font size="2" face="arial, helvetica, sans-serif"><br></font></div><div id="0380e888-9984-47d9-80ce-934ed8eb647c"><font size="2" face="arial, helvetica, sans-serif">Also performed minor re-factoring and log cleanup</font></div></div></div></body></html>