/soc/2013/ankitkv/gobjectification: 5a5f62b31dec: Fixed a missin...

[Ankit Vani]

Changeset: 5a5f62b31dec4e06f87062731c1efd0dfb57077e
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-26 17:07 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/5a5f62b31dec

Description:

Fixed a missing 'and'

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