Merge remote-tracking branches 'crybaby/master', 'gibson/master' and 'mdwdev/master'
[profile] / dot / cgrc
1 log -c
2 diff -c