Marco Ciampa 3cd4076d8b Merge branch of git://github.com/ElektroQuark/kicad-i18n ... Conflicts: es/kicad.po		2015-11-25 17:30:54 +01:00
..
kicad.po	Merge branch of git://github.com/ElektroQuark/kicad-i18n	2015-11-25 17:30:54 +01:00