Tom Willemsen 90cccbae8a Merge remote-tracking branch 'ryuslash/master' into phoenix ... Conflicts: .config/herbstluftwm/autostart .xbindkeysrc.scm .xinitrc		2012-05-22 14:36:52 +00:00
..
autostart	Merge remote-tracking branch 'ryuslash/master' into phoenix	2012-05-22 14:36:52 +00:00
panel.sh	Merge remote-tracking branch 'ryuslash/master' into phoenix	2012-05-22 14:36:52 +00:00