Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
authorEvan Prodromou <evan@status.net>
Sat, 28 Jul 2012 17:55:10 +0000 (13:55 -0400)
committerEvan Prodromou <evan@status.net>
Sat, 28 Jul 2012 17:55:10 +0000 (13:55 -0400)
commitf04452c70a2cdc56d001bb5442af8f51382444bd
tree2685f4717edd62c63bbf8514300517536973a2f8
parent8cd1bdc686ce5a685a56f0c72ee5c03c6c744a2d
parent9034148e0d1fdab17b210ebaf3f0d92693429637
Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x