Merge branch '0.7.x' of git@gitorious.org:+laconica-developers/laconica/dev into...
authorEvan Prodromou <evan@controlyourself.ca>
Sat, 6 Jun 2009 16:55:17 +0000 (09:55 -0700)
committerEvan Prodromou <evan@controlyourself.ca>
Sat, 6 Jun 2009 16:55:17 +0000 (09:55 -0700)
commit038cd8ac2545dfbca5ae747a0ffaf370b2861cf2
treec358f67bb6adecf62e1b9caea9b1fa06c62d5c09
parentd15fdac3d348eda7314a206c2403494e9a096c98
parent6658e2a2ee9517bebd59cf69d7483e6eda691b4e
Merge branch '0.7.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.7.x