comparison libpurple/purple-remote @ 25968:f0864ef7aa5b

merge of '48260c71a42cee1dd4e220b7c672187cfe99cc2f' and 'c45d4f4446ba8de761e53590b8f0b67cb7e4acf0'
author John Bailey <rekkanoryo@rekkanoryo.org>
date Wed, 04 Mar 2009 06:29:36 +0000
parents 46c0ca2b7b3b
children 96f82cc12238
comparison
equal deleted inserted replaced
25966:36f6f798e48a 25968:f0864ef7aa5b