Merge remote branches 'ponder' and 'crybaby'
authorMark Wooding <mdw@distorted.org.uk>
Thu, 6 May 2010 14:28:22 +0000 (15:28 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Thu, 6 May 2010 14:28:22 +0000 (15:28 +0100)
commitee8e5aad8008c565d7a947e01ee544f22c8efe89
treec9bd79b3af2e1d788c19fbd8b6dc1a8f0ad2e3cd
parent6c680ad0afda24e64bb09799d94c619f7641e429
parent1ee519346fac51178b3e3e55565531f0cdd4d4be
Merge remote branches 'ponder' and 'crybaby'

* ponder:
  dot/gnus.el: Hack for closing the summary view.
  dot/bashrc: Minor options tweaks.

* crybaby:
  dot/bash_profile: Use gnome-keyring-daemon's SSH agent if available.