Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
authorEvan Prodromou <evan@controlyourself.ca>
Wed, 15 Jul 2009 20:03:38 +0000 (16:03 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Wed, 15 Jul 2009 20:03:38 +0000 (16:03 -0400)
commit412c5d23de90b7857cbd3a151c37ba75a2ded4ac
treeee1c7d584a625a97ffebadd42548a5326c2e9821
parent488befd6282bdcc706920fcc0332943ae808af00
parent81e6500cb95dd43bd0bb8c0a97b59266b82ef2a0
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x