]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
authorFederico Marani <federico.marani@ymail.com>
Sat, 28 Mar 2009 13:52:01 +0000 (13:52 +0000)
committerFederico Marani <federico.marani@ymail.com>
Sat, 28 Mar 2009 13:52:01 +0000 (13:52 +0000)
commit4b3f022fc2ff142e6d1cb6740b7f89108cfda292
treea7e0f0e6730a02e6a2fc6196bbeabcb1b932baae
parent420c3613049bec1360cdeb1f50283b239adf23d3
parent8c073a34ce472fc8d0385659a222339a5ba4254a
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x

Conflicts:

lib/jabber.php