Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
authorBrion Vibber <brion@pobox.com>
Wed, 24 Feb 2010 23:48:27 +0000 (15:48 -0800)
committerBrion Vibber <brion@pobox.com>
Wed, 24 Feb 2010 23:48:27 +0000 (15:48 -0800)
commit3194a86caa02f5796f468a7d2ebc8e54139fb1cb
tree7e1047fd9ccc7da5cd078ddc7ca13147069881d6
parent59be4b8cae992476628b23c2976d335e4f704c89
parentf0d1d07b94fbd2fe0ecd1c2f18d831a177d11c5c
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x