Merge branch 'master' of gitorious.org:statusnet/mainline
authorEvan Prodromou <evan@status.net>
Thu, 26 Jan 2012 16:04:54 +0000 (11:04 -0500)
committerEvan Prodromou <evan@status.net>
Thu, 26 Jan 2012 16:04:54 +0000 (11:04 -0500)
commit108d5d8d1715a79fbabc3c2cf185293d084c706b
tree60f98d28049d04711c9eced2d7273cd50d19d0c5
parentf21f09f8b87cb84486e8316218d52f42a436f2a5
parent259a262df42b039be144dc2f1fd9a239659efdb1
Merge branch 'master' of gitorious.org:statusnet/mainline