[SCM] cecilia/master: New upstream release

[tiago at users.alioth.debian.org]

Imported Upstream version 5.2.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f316aa741f865cd089a76673285a5fbc4dac6e51
X-Git-Newrev: f984e2ec1b7727d60075b1af9cc1ce70ac8b5ed9

The following commit has been merged in the master branch:
commit e5836154a151b1fb8f09442e7fb32c1584beb498
Merge: f316aa741f865cd089a76673285a5fbc4dac6e51 4438378d19b7fd3046c5aa3669d375acd6277b77
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date:   Thu Mar 10 00:38:05 2016 -0500

    New upstream release

diff --combined .gitignore
index a178149,bf255fb..afa197a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,62 +1,67 @@@
++<<<<<<< HEAD
 +.pc
 +*.py[cod]
++=======
+ # Byte-compiled / optimized / DLL files
+ __pycache__/
+ *.py[cod]
+ *$py.class
+ 
+ # C extensions
+ *.so
+ 
+ # Distribution / packaging
+ .Python
+ env/
+ build/
+ develop-eggs/
+ dist/
+ downloads/
+ eggs/
+ .eggs/
+ lib/
+ lib64/
+ parts/
+ sdist/
+ var/
+ *.egg-info/
+ .installed.cfg
+ *.egg
+ 
+ # PyInstaller
+ #  Usually these files are written by a python script from a template
+ #  before PyInstaller builds the exe, so as to inject date/other infos into it.
+ *.manifest
+ *.spec
+ 
+ # Installer logs
+ pip-log.txt
+ pip-delete-this-directory.txt
+ 
+ # Unit test / coverage reports
+ htmlcov/
+ .tox/
+ .coverage
+ .coverage.*
+ .cache
+ nosetests.xml
+ coverage.xml
+ *,cover
+ 
+ # Translations
+ *.mo
+ *.pot
+ 
+ # Django stuff:
+ *.log
+ 
+ # Sphinx documentation
+ docs/_build/
+ 
+ # PyBuilder
+ target/
+ 
+ # OSX Desktop
+ .DS_Store
+ 
++>>>>>>> upstream/5.2.1

-- 
cecilia packaging