]> git.mxchange.org Git - quix0rs-gnu-social.git/commit
Resolve conflicts
authorMike Cochrane <mikec@mikenz.geek.nz>
Tue, 22 Jul 2008 20:53:15 +0000 (16:53 -0400)
committerMike Cochrane <mikec@mikenz.geek.nz>
Tue, 22 Jul 2008 20:53:15 +0000 (16:53 -0400)
commit49f30e23a34d59cc9784c256ffebbf586adc0970
tree067ec98a4202aab66c57104e30c31b46335097c3
parentde280a4d7f8a8461f14ed1a83958cef0af6aebee
Resolve conflicts

darcs-hash:20080722205315-533db-7ebf783855b8f1b302c52ec431b4025ef0983c82.gz
classes/stoica.ini