Merge branch 'master' of github.com:olea/lemarios - lemarios

commit 09ed3403bd10cae1b0ba0807c686d8a9a0e1a7c8
parent c23444219d19cd8a20b5436fbf3bffcdeebd093d
Author: Ismael Olea <ismael@olea.org>
Date:   Mon,  9 Jul 2012 19:05:09 +0200

Merge branch 'master' of github.com:olea/lemarios

	lemarios Listas de palabras en español
	Log \| Files \| Refs \| README