Removed dead code
Ignored the debs-ppa directories
Removed more dead code
set versions to 3.1 and added some pre-depends
moved ids to contrib
move keyring.gpg from scripts to extra
install ChangeLogs under /usr/share/doc
Merge pull request #308 from Zentyal/cperello/minor-fixes

Cperello/minor fixes
Merge branch 'jacalvo/3.1-packaging'

Conflicts:
	main/core/ChangeLog
	main/ebackup/ChangeLog
	main/printers/ChangeLog
	main/remoteservices/ChangeLog
	main/samba/ChangeLog
	main/squid/ChangeLog
	main/users/ChangeLog
	main/zarafa/ChangeLog
Merge branch 'master' into cperello/l2tp

Conflicts:
	main/dhcp/ChangeLog
	main/ipsec/ChangeLog
	main/ipsec/debian/precise/control