Setup
Update cpasbien.py
Update pushbullet.py
Merge branch 'development'
Update pushbullet.py
Update pushbullet.py
Bugfix : get pushbullet devices with new api
Revert "Setup"

This reverts commit 0bbe992bfa4569780b81261ae7151b533985f324.
Remove VO search on FTDB
Remove VO search on t411
Update cpasbien.py
Merge pull request #283 from kinooo/patch-1

Update cpasbien.py
Merge branch 'development' of https://github.com/sarakha63/Sick-Beard into development

Conflicts:
	sickbeard/providers/cpasbien.py
Merge branch 'master' into development
Merge pull request #286 from jymannob/development

Fix Pushbullet new api
Merge pull request #288 from sarakha63/development

merge PR
Update ftdb.py

correction of :
TypeError: cannot concatenate 'str' and 'int' objects
Merge pull request #290 from GaetanCambier/patch-2

Update ftdb.py
Merge pull request #291 from sarakha63/master

Master
Update errorlogs.tmpl

Reverse order of error log (newest error on top)