deleted
Merge branch 'master' of github.com:ravench/config

Conflicts:
	Trolltech.conf
	dconf/user
	dwb/default/cookies
	dwb/default/history
	dwb/default/navigate.history
	dwb/default/session
	vlc/vlc-qt-interface.conf
	vlc/vlcrc