Wee
Merge branch 'master' of github.com:oneirosFade/dotfiles

Conflicts:
	conf/weechat/irc.conf

Foo
Merge branch 'master' of github.com:oneirosFade/dotfiles

LOLWUT
Merge branch 'master' of github.com:oneirosFade/dotfiles
Weechat