# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1178059530 0
# Node ID 0e37845d97f03afaeacd4dc235ca8ad4be56c9d2
# Parent  c3e5250795abd04109b084089f0b786edafe1c98# Parent  1777ae9c8a0ba75ad12330fcd168cbdbd08ce81b
merge of '4b34ba91b3be407b1921ddbb7a7ff43a418af188'
     and 'e4b381856857b16f382417e5971b9b04113e0e61'

diff -r c3e5250795ab -r 0e37845d97f0 po/zh_CN.po