Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
authorEvan Prodromou <evan@controlyourself.ca>
Fri, 6 Feb 2009 08:56:15 +0000 (03:56 -0500)
committerEvan Prodromou <evan@controlyourself.ca>
Fri, 6 Feb 2009 08:56:15 +0000 (03:56 -0500)
commitbb2cb65c2aa763c8b28c41b9811c6026a11482db
tree958e982fd920cb1ba670e73fda2d3e231b0e77d7
parentfc094e0cf432c223676755f14f54d3a2f559c25e
parenta6cf3a2fb3b150cba06143f6a744a49a0cf91e83
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x