From: Zach Copley Date: Fri, 19 Mar 2010 00:11:06 +0000 (-0700) Subject: Merge branch 'testing' of gitorious.org:statusnet/mainline into testing X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a6c9445f0de1a74ffc81dda12eaba6ee36410716;p=quix0rs-gnu-social.git Merge branch 'testing' of gitorious.org:statusnet/mainline into testing * 'testing' of gitorious.org:statusnet/mainline: OStatus discover fixes: Remove xpm support (no one really uses it, and IMAGETYPE_XPM is undefined, causing warnings) Fix notice warning about unused var -- was renamed during refactoring. --- a6c9445f0de1a74ffc81dda12eaba6ee36410716