resolve conflicts in config.php.sample
resolve conflicts in config.php.sample

darcs-hash:20081211162558-5ed1f-1eb8afbadbaa5f84140cbd255b1c01dc456577fd.gz

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