4 commits

Author	SHA1	Message	Date
Tom Willemsen	821793e7de	Merge remote-tracking branch 'origin/master' into phoenix ... Conflicts: .xinitrc	2012-10-17 08:48:46 +02:00
Tom Willemsen	e3a2616488	.emacs.d/site-lisp/oni.el	2012-10-17 00:38:18 +02:00
Tom Willemsen	0c6b068a8f	.emacs.d/site-lisp/oni.el	2012-10-16 10:04:32 +02:00
Tom Willemsen	838fc8289c	.emacs.d/site-lisp/oni.el	2012-10-11 21:23:13 +02:00