Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Sun, 22 Jan 2012 02:12:53 +0000 (21:12 -0500)
committerEvan Prodromou <evan@status.net>
Sun, 22 Jan 2012 02:12:53 +0000 (21:12 -0500)
commit259a262df42b039be144dc2f1fd9a239659efdb1
treeb69b4b39c3db90d7f2ffcf73d5fba84c0c9c2933
parentb475c871a4a6b50e270a128fd16146893cbf68a7
parent98acec74f5c19050163c9233588a6fb46bd0c52d
Merge branch 'master' of gitorious.org:statusnet/mainline