From: gumartinm <gustavo@gumartinm.name>
Date: Wed, 5 Dec 2012 04:08:15 +0000 (+0100)
Subject: Merge branch 'master' of http://git.gumartinm.name/PFCLatex/
X-Git-Url: https://git.gumartinm.name/?a=commitdiff_plain;h=48bc62ea36358c154f182542ecd5d4d4ce954635;p=PFCLatex%2F.git

Merge branch 'master' of git.gumartinm.name/PFCLatex/

Conflicts:
	glosario/glosario.tex
---

48bc62ea36358c154f182542ecd5d4d4ce954635