Merge pull request #206 from mondeja/es_ES-and

Add es_ES '%s and %s' translation

Author: hugovk

src/humanize/locale/es_ES/LC_MESSAGES/humanize.po

@@ -311,4 +311,4 @@ msgstr "ayer"
 #: src/humanize/time.py:534
 #, python-format
 msgid "%s and %s"
-msgstr ""
+msgstr "%s y %s"