Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Tue, 7 Feb 2012 15:27:40 +0000 (16:27 +0100)
committerEvan Prodromou <evan@status.net>
Tue, 7 Feb 2012 15:27:40 +0000 (16:27 +0100)
commit710febfba16d19e0ca46a88ffcb16eb6b5521be2
treef2536033b11fa5e207d6bde313e9ccbdb1201e09
parent4a95a0bb6073bf9db71bd049b3e96fd860671be1
parent5b6ecef24b85304661c6b33ae4b15bf8805ad6a2
Merge branch 'master' of gitorious.org:statusnet/mainline