/soc/2013/ankitkv/gobjectification: e2b91d8ab938: Merged soc.201...

[Ankit Vani]

Changeset: e2b91d8ab9382115b277d6b0147fd7f7bb9a8538
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-26 17:08 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/e2b91d8ab938

Description:

Merged soc.2013.gobjectification branch

diffstat:

 ChangeLog.API |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -14,7 +14,7 @@ version 3.0.0 (??/??/????):
 		* purple_buddy_presence_new
 		* purple_account_register_completed
 		* PurpleAESCipher, PurpleDESCipher, PurpleDES3Cipher, PurpleHMACCipher,
-		  PurplePBKDF2Cipher PurpleRC4Cipher inherit PurpleCipher
+		  PurplePBKDF2Cipher and PurpleRC4Cipher inherit PurpleCipher
 		* purple_aes_cipher_new
 		* purple_des3_cipher_new
 		* purple_des_cipher_new