Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11

* jk/maint-quiet-is-synonym-to-s-in-log: log: fix --quiet synonym for -s

Junio C Hamano committed Sep 14, 2012 at 20:48 UTC 19ece726e194f86b8d316d35b65daa92c245453b

No changes.