Hannes Körber 44235ed5c2 Merge branch 'master' of github.com:whatevsz/dotfiles ...

Conflicts:
	i3/i3/config
	x/xinitrc

2013-09-20 15:27:33 +02:00

..

i3

Merge branch 'master' of github.com:whatevsz/dotfiles

2013-09-20 15:27:33 +02:00