configs
Merge branch 'master' of github.com:oren/dotfiles

Conflicts:
	ubuntu-server/weechat/script/plugins.xml.gz