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