]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.8.x' of jill@xmpp001.controlezvous.ca:/opt/local/share/laconica into...
authorEvan Prodromou <evan@controlyourself.ca>
Sun, 28 Jun 2009 20:20:58 +0000 (16:20 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Sun, 28 Jun 2009 20:20:58 +0000 (16:20 -0400)
1  2 
scripts/commandline.inc

Simple merge