From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 4 Oct 2009 23:15:03 +0000 (+0100)
Subject: Merge branch 'master' of metalzone:etc/profile
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/be2cc788c85f818214bbcd3089eb2f481dd8b831?hp=be2cc788c85f818214bbcd3089eb2f481dd8b831

Merge branch 'master' of metalzone:etc/profile

* 'master' of metalzone:etc/profile:
  dot/bash_profile: Make OpenOffice not use ugly widgets.
  dot/gnus.el: Use distinct article buffers for different groups.
  dot/e16-bindings: Make 5-F6 toggle keyboard mouse control.
  dot/emacs, el/dot-emacs.el: Reformat in line with current styles.

Conflicts:
	el/dot-emacs.el: Style hacking conflicted with Python fixing
---