Merged v0.33-devel version into Master

covers/*

*.fb2

*.log

*.swp

py/__pycache__/*

py/ziptest.py

py/fb2parse.py

py/b64decode.py

fb2toepub/*

!fb2toepub/*.zip

fb2conv/*

!fb2conv/*.zip

!fb2conv/*.gz

!fb2conv/fb2epub

!fb2conv/fb2mobi

testinfo/*

speed

.htaccess

*.pid

db.sqlite3

.idea/*

<?xml version="1.0" encoding="UTF-8"?>

<projectDescription>

	<name>sopds</name>

	<comment></comment>

	<projects>

	</projects>

	<buildSpec>

		<buildCommand>

			<name>org.python.pydev.PyDevBuilder</name>

			<arguments>

			</arguments>

		</buildCommand>

	</buildSpec>

	<natures>

		<nature>org.python.pydev.pythonNature</nature>

		<nature>org.python.pydev.django.djangoNature</nature>

	</natures>

</projectDescription>

<?xml version="1.0" encoding="UTF-8" standalone="no"?>

<?eclipse-pydev version="1.0"?><pydev_project>

<pydev_variables_property name="org.python.pydev.PROJECT_VARIABLE_SUBSTITUTION">

<key>DJANGO_MANAGE_LOCATION</key>

<value>manage.py</value>

</pydev_variables_property>

<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">

<path>/${PROJECT_DIR_NAME}</path>

</pydev_pathproperty>

<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 3.0</pydev_property>

<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>

</pydev_project>

eclipse.preferences.version=1

encoding//opds_catalog/dl.py=utf-8

encoding//opds_catalog/sopdscan.py=utf-8

encoding//opds_catalog/tests/test_dl.py=utf-8

encoding//opds_catalog/tests/test_feeds.py=utf-8

encoding/<project>=UTF-8

language: python

python:

    - 3.3

    - 3.4

    - 3.5

install:

    - if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then travis_retry pip install -r requirements-p33.txt; fi

    - if [[ $TRAVIS_PYTHON_VERSION == '3.4' || $TRAVIS_PYTHON_VERSION == '3.5' ]]; then travis_retry pip install -r requirements.txt; fi

script:

    - python manage.py test

branches:

    only:

        - v0.31-devel