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)
Conflicts:
glosario/glosario.tex


Trivial merge