Colin Powell f5a639ed07 [gtk] Fixes merge conflict in servers file hace 6 meses
..
gtk-3.0 f5a639ed07 [gtk] Fixes merge conflict in servers file hace 6 meses