dot/gitconfig.in: Stage merge conflicts fixed up by `git-rerere'.
[profile] / dot / mdw.session
2011-06-04 Mark WoodingMerge remote-tracking branch 'crybaby'
2011-06-04 Mark WoodingGnome hacking: Introduce a custom session file.