Merge branch 'release/2.5' into develop
Merge branch 'hotfix/2.5.1' into develop
add world-wraps to alternatives
fix alternatives on signal
Merge branch 'release/2.5.2'
Merge branch 'release/2.5.2' into develop
Merge remote-tracking branch 'upstream/develop' into develop
sync changelog with package changelog
make resource_filename work in deb package
Merge data
Merge remote-tracking branch 'upstream/develop' into develop
remove setup.py for ubuntu software center
Remove package specified files
Fix pasting formatted text
Remove link formatting from python part, use django-like variables in editor.html
Merge remote-tracking branch 'upstream/develop' into develop
Added Dutch translation provided by Vistaus.
Added Dutch translation provided by Vistaus.
Create links on paste on client size
fix #272
Merge pull request #276 from duizendnegen/develop

Dutch translation