]> git.mxchange.org Git - quix0rs-gnu-social.git/commit - plugins/BlogspamNet/locale/zh_CN/LC_MESSAGES/BlogspamNet.po
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Mon, 20 Dec 2010 22:23:15 +0000 (14:23 -0800)
committerBrion Vibber <brion@pobox.com>
Mon, 20 Dec 2010 22:23:15 +0000 (14:23 -0800)
commitb83e7005ed9dfe8675f9fbbae00650a8c6a62511
treed18c914503b1d4f0527174a866a3434b110400c0
parentc71d701a3f32472bb71ae38d21a4dd16ea1dcb97
parent46123e37543be4ea784e90528176fd205bfece49
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
plugins/OStatus/classes/FeedSub.php