Merge branch 'master' of git@gitorious.org:statusnet/mainline
authorSarven Capadisli <csarven@status.net>
Tue, 26 Jan 2010 00:29:10 +0000 (01:29 +0100)
committerSarven Capadisli <csarven@status.net>
Tue, 26 Jan 2010 00:29:10 +0000 (01:29 +0100)
commit6cfe5b5a3bfe4cbdecc6adf39f8f7b133fbd7550
treef9314cb28d7fbe56c5ab0d3d0ac6211036eb61c8
parent9bacdb9134b39f97fd244bdc28d9e467ac05b61d
parente26a843caf9f6bb0d11a7128884db235ededcce0
Merge branch 'master' of git@gitorious.org:statusnet/mainline