Merging XMPP SoC branch

[Ethan Blanton]

Sean Egan spake unto us the following wisdom:
> On 7/10/07, Richard Laager <rlaager at wiktel.com> wrote:
> > I was under the impression that SoC projects had mentors.
> > (In case anyone is missing the sarcasm, I'm an SoC mentor.)
> 
> True, but Andy's mentor doesn't have commit access to Pidgin, hence
> the appeal upstream.

Holy crap, you people have been DAMAGED by svn.

Augie and Andreas can sync among each other, of course.  It's 2007.
Any revisions from Augie which Andreas subsequently syncs to pidgin.im
will be accepted the same as any other.

Ethan

-- 
The laws that forbid the carrying of arms are laws [that have no remedy
for evils].  They disarm only those who are neither inclined nor
determined to commit crimes.
		-- Cesare Beccaria, "On Crimes and Punishments", 1764
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://pidgin.im/pipermail/devel/attachments/20070713/43063fc4/attachment.sig>