Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
authorEvan Prodromou <evan@controlyourself.ca>
Tue, 14 Apr 2009 20:01:22 +0000 (16:01 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Tue, 14 Apr 2009 20:01:22 +0000 (16:01 -0400)
commit0073a75dff5ac60f98933900745d949e9635c34c
treec74e3593811f645267eda0c03304d45b4119cd87
parentb1940bcb7b028b993b26cd3c36f4fdbbc79c96e6
parent9f2e2e4b2c1b428a1892c57c7194fbc5ede5b125
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x