This is a copy of the debian dir, the main change is to the Changelog so that the package gets built for precise
merge master into modern
Merge remote-tracking branch 'upstream/modern' into modern

Conflicts:
	.travis.yml
	web/ajax/stream.php
	web/includes/actions.php
	web/includes/functions.php
	web/skins/classic/js/skin.js
	web/skins/classic/views/watch.php