Merge branch 'maint'
commit3daff7c31998faedbe0dd7e2b8651e351be40d64
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Dec 2011 00:34:20 +0000 (20 16:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Dec 2011 00:34:20 +0000 (20 16:34 -0800)
tree874039c5b8eeb1a45b20e1387424d5e92806ff0d
parent8d68493f20db71abeb77adc251b2a116fe45cdaa
parent97f261b1e7f1af54aed700e61cdb8af74dbd2459
Merge branch 'maint'

* maint:
  builtin/init-db.c: eliminate -Wformat warning on Solaris