OSDN Git Service

Merge branch 'origin'
authorWilly TARREAU <willy@pcw.(none)>
Sun, 7 May 2006 07:23:35 +0000 (09:23 +0200)
committerWilly TARREAU <willy@pcw.(none)>
Sun, 7 May 2006 07:23:35 +0000 (09:23 +0200)
commit9dd0326e3fb3963c2d478f65bdb74c5f90eeef4c
treeb1b358d9a87ec071880c2a4ba0461bae8e7c720d
parent068cd1d7986d8de608fdbefc39f2ab8e2f08aaa4
parent6865793264cc0e0b20f3fd93c06b1c6b8481ec62
Merge branch 'origin'