Tom Willemsen 69fd0e5aef Merge remote-tracking branch 'ryuslash/master' into phoenix ... Conflicts: .xinitrc		2012-06-17 21:28:28 +00:00
..
.gitignore	Ignore more	2012-02-23 18:39:36 +01:00
config.fish	Merge remote-tracking branch 'ryuslash/master' into phoenix	2012-06-17 21:28:28 +00:00