Fix conflict from merge with 0.7.x; remove conflict markers
Fix conflict from merge with 0.7.x; remove conflict markers

znarf/statusnet-ladistribution,eXcomm/gnu-social,studio666/gnu-social,brion/StatusNet,bankonme/gnu-social,faulteh/gnu-social,charnimda/lgbtpzn-social,zcopley/zcopleys-statusnet-clone,charlycoste/StatusNet,xebia/statusnet-oauth2,studio666/gnu-social,meitar/laconica,csarven/statusnet,xebia/statusnet-oauth2,sikevux/bsk-social,gnusocial/mainline,d3vgru/StatusNet,csarven/statusnet,zcopley/zcopleys-statusnet-clone,UngPirat/freesocial,bankonme/gnu-social,faulteh/gnu-social,foocorp/gnu-social,Br3nda/laconica,csarven/statusnet,eXcomm/gnu-social,zcopley/StatusNet,Br3nda/laconica,charnimda/lgbtpzn-social,UngPirat/freesocial,faulteh/gnu-social,sikevux/bsk-social,shashi/StatusNet,minmb/statusnet,gnusocial/mainline,zh/statusnet,eXcomm/gnu-social,foocorp/gnu-social,znarf/statusnet-ladistribution,shashi/StatusNet,sikevux/bsk-social,znarf/statusnet-ladistribution,Piratas/tortuga,UngPirat/freesocial,d3vgru/StatusNet,shashi/StatusNet,brion/StatusNet,faulteh/gnu-social,xebia/statusnet-oauth2,d3vgru/StatusNet,chimo/social,Piratas/tortuga,gnusocial/mainline,meitar/laconica,zcopley/StatusNet,chimo/social,furtherfield/gnu-social,csarven/statusnet,minmb/statusnet,bankonme/gnu-social,gnusocial/mainline,Piratas/tortuga,Br3nda/laconica,sikevux/bsk-social,zh/statusnet,studio666/gnu-social,Piratas/tortuga,zcopley/zcopleys-statusnet-clone,charlycoste/StatusNet,charnimda/lgbtpzn-social,chimo/social,eXcomm/gnu-social,brion/StatusNet,furtherfield/gnu-social,furtherfield/gnu-social,zcopley/StatusNet,studio666/gnu-social,bankonme/gnu-social,foocorp/gnu-social,minmb/statusnet,charlycoste/StatusNet,furtherfield/gnu-social,zh/statusnet,meitar/laconica