Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
authorEvan Prodromou <evan@controlyourself.ca>
Mon, 13 Apr 2009 19:51:12 +0000 (15:51 -0400)
committerEvan Prodromou <evan@controlyourself.ca>
Mon, 13 Apr 2009 19:51:12 +0000 (15:51 -0400)
commit3a0c59052ace6cdd1ac23e8f6b5c5ba8cb6fffcd
tree9fa3dfae7195acb294bf867953a9a14b3ca80aff
parente9e75fc9d5f44b2ffe10602a3bd183cccb7da4ec
parentd4f9f2c69bb9cba7aa2ff67a2b75d106f1bd1607
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x