Commit Graph

3 Commits

Author SHA1 Message Date
Evan Prodromou
a08c76a434 Merge branch '0.9.x' of git@gitorious.org:laconica/mainline into 0.9.x
Conflicts:
	classes/laconica.ini
2009-08-27 14:52:32 -07:00
Brenda Wallace
6c3149334c Merge commit 'mainline-write/0.8.x' into 0.8.x 2009-08-26 10:02:07 +12:00
Brenda Wallace
3400f6f431 renamed to plural, for consitency 2009-08-26 10:00:29 +12:00