Merge branch '0.7.x' of git://gitorious.org/laconica/dev into 0.7.x
authorEvan Prodromou <evan@controlyourself.ca>
Fri, 29 May 2009 19:37:40 +0000 (19:37 +0000)
committerEvan Prodromou <evan@controlyourself.ca>
Fri, 29 May 2009 19:37:40 +0000 (19:37 +0000)
commit4baef3624384bb1a72ddc0937cb2bae0ee6809b2
treea0b75a17b2c96c96ed3cba56b9c5f7e6dc1af270
parent3532cd0490a70b54a92108549de6042459fd8469
parent6885f082ea4191702b525bd5ad693baa13de8879
Merge branch '0.7.x' of git://gitorious.org/laconica/dev into 0.7.x