This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice-dictionaries.
commit 0eb252aba88abd405171e2a852a47aa76bf07536
Merge: 2c122b4 baf5187
Author: Rene Engelhard <r...@rene-engelhard.de>
Date: Mon Mar 7 21:14:47 2016 +0100
Merge tag 'upstream/5.1.1'
Upstream version 5.1.1
Conflicts:
ChangeLog-dictionaries
ChangeLog-dictionaries | 25 +-
dictionaries/es/README_es_ANY.txt | 18 +-
dictionaries/es/README_hyph_es_ANY.txt | 19 +-
dictionaries/es/README_th_es_ANY.txt | 8 +-
dictionaries/es/es_ANY.aff | 10634 +++---
dictionaries/es/es_ANY.dic | 42180 ++++++++++++++----------
dictionaries/es/package-description.txt | 2 +-
dictionaries/es/th_es_ANY_v2.dat | 52386 +++++++++++++++---------------
8 files changed, 56827 insertions(+), 48445 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice-dictionaries.git
