Merge branch 'master' of http://git.gumartinm.name/PFCLatex/
authorgumartinm <gustavo@gumartinm.name>
Wed, 5 Dec 2012 04:08:15 +0000 (05:08 +0100)
committergumartinm <gustavo@gumartinm.name>
Wed, 5 Dec 2012 04:08:15 +0000 (05:08 +0100)
commit48bc62ea36358c154f182542ecd5d4d4ce954635
tree22e0a69034048ee6e90675a07e9e6adb37f036e1
parentb81241aa85e5966dd9d9c707d43fc0d8c26b1115
parentdcc0d3ed9c9165236e8610b59a413a7b0196d37f
Merge branch 'master' of git.gumartinm.name/PFCLatex/

Conflicts:
glosario/glosario.tex