Handle conflicts from git merge release-20160315
-rw-r--r-- 154 .gbp.conf
-rw-r--r-- 4 .gitignore
-rw-r--r-- 172 AUTHORS
-rw-r--r-- 27797 CHANGELOG
-rw-r--r-- 273 MANIFEST.in
-rw-r--r-- 168 NEWS
-rw-r--r-- 1975 PKG-INFO
-rw-r--r-- 13603 README.txt
drwxr-xr-x - bin
-rw-r--r-- 15757 distribute_setup.py
drwxr-xr-x - doc
drwxr-xr-x - examples
drwxr-xr-x - functional_tests
-rwxr-xr-x 240 install-rpm.sh
-rw-r--r-- 26432 lgpl.txt
drwxr-xr-x - nose.egg-info
drwxr-xr-x - nose
-rw-r--r-- 13670 nosetests.1
drwxr-xr-x - packaging
-rw-r--r-- 20229 patch.py
-rwxr-xr-x 1444 selftest.py
-rw-r--r-- 200 setup.cfg
-rw-r--r-- 3920 setup.py
-rw-r--r-- 5945 setup3lib.py
drwxr-xr-x - unit_tests