new stuff again
Merge branch 'master' of https://github.com/bpneumann/deluge

Conflicts:
	deluge/deluge.vcxproj
	deluge/deluge.vcxproj.filters