connman
run wallpaper script earlier
Merge branch 'master' of https://github.com/FruitieX/dotfiles
go back to pentadactyl
symlink _pentadactylrc
firefox stable pls
Merge branch 'master' of http://github.com/FruitieX/dotfiles
firefox-nightly -> firefox
more /dev/null
better default colors for weechat bars
Merge branch 'master' of http://github.com/FruitieX/dotfiles
same thing with these
sigh
Merge branch 'master' into servy

Conflicts:
	.vim/bundle/vim-easymotion.git