Merge branch 'jk/maint-quiet-is-synonym-to-s-in-log' into maint-1.7.11
authorJunio C Hamano <gitster@pobox.com>
Sat, 15 Sep 2012 03:48:31 +0000 (20:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 15 Sep 2012 03:48:31 +0000 (20:48 -0700)
* jk/maint-quiet-is-synonym-to-s-in-log:
  log: fix --quiet synonym for -s


Trivial merge