]> 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, 7 Mar 2009 13:54:54 +0000 (13:54 +0000)
committerFederico Marani <federico.marani@ymail.com>
Sat, 7 Mar 2009 13:54:54 +0000 (13:54 +0000)
commitbab3e1b8586f42bc1f0a5f96b6990d67c6b74446
tree559729d3330991c0c68da96350b71434ca4f6f87
parenta389f157baddafa91347c27194805580b1373e30
parent13c183e2f4e0738233658ca79103bbe4a6d57992
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x

Conflicts:

lib/util.php
config.php.sample
lib/jabber.php
lib/util.php