Merge branch 'master' into fairchild
[profile] / dot / cgrc
1 log -c
2 diff -c