Merge branch 'master' of ../laconica-stable
authorEvan Prodromou <git@evanprodromou.name>
Thu, 8 Jan 2009 21:01:54 +0000 (16:01 -0500)
committerEvan Prodromou <git@evanprodromou.name>
Thu, 8 Jan 2009 21:01:54 +0000 (16:01 -0500)
commit2d456a15e5652a0c0e2c0f9f50221eed2d16e109
tree9bbb5f582a1ed64800c9440d519e4df09e01d30a
parent93cb7e07f7aec6cff62c4b51d9fddf5ac46d18ad
parent28d17d8d90b8b15eec2baa19d7c3bfaf5ad057db
Merge branch 'master' of ../laconica-stable