Just had to update util.min.js one more time for extra merge conflict fun!
Just had to update util.min.js one more time for extra merge conflict fun!

zcopley/StatusNet,sikevux/bsk-social,eXcomm/gnu-social,gnusocial/mainline,UngPirat/freesocial,Piratas/tortuga,eXcomm/gnu-social,UngPirat/freesocial,furtherfield/gnu-social,d3vgru/StatusNet,Piratas/tortuga,charnimda/lgbtpzn-social,csarven/statusnet,minmb/statusnet,bankonme/gnu-social,charlycoste/StatusNet,xebia/statusnet-oauth2,bankonme/gnu-social,sikevux/bsk-social,charlycoste/StatusNet,chimo/social,charnimda/lgbtpzn-social,d3vgru/StatusNet,furtherfield/gnu-social,gnusocial/mainline,Piratas/tortuga,zcopley/StatusNet,foocorp/gnu-social,faulteh/gnu-social,bankonme/gnu-social,foocorp/gnu-social,faulteh/gnu-social,sikevux/bsk-social,UngPirat/freesocial,zcopley/StatusNet,gnusocial/mainline,sikevux/bsk-social,d3vgru/StatusNet,minmb/statusnet,charlycoste/StatusNet,csarven/statusnet,studio666/gnu-social,xebia/statusnet-oauth2,charnimda/lgbtpzn-social,furtherfield/gnu-social,faulteh/gnu-social,studio666/gnu-social,gnusocial/mainline,foocorp/gnu-social,chimo/social,bankonme/gnu-social,xebia/statusnet-oauth2,chimo/social,studio666/gnu-social,eXcomm/gnu-social,faulteh/gnu-social,studio666/gnu-social,furtherfield/gnu-social,csarven/statusnet,Piratas/tortuga,csarven/statusnet,minmb/statusnet,eXcomm/gnu-social