]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' into facebook-upgrade
authorZach Copley <zach@status.net>
Tue, 2 Nov 2010 23:17:07 +0000 (23:17 +0000)
committerZach Copley <zach@status.net>
Tue, 2 Nov 2010 23:17:07 +0000 (23:17 +0000)

Trivial merge