tree b3fa6156e3bbcc570282debfc924c8e7af4ec98d
parent 1209033e46b3a4e93d9571911dc5c0b5daf5deba
parent 4d2d098ea3b41d88a9559fa52dc2bf84071c5cc3
author Willy Tarreau <w@1wt.eu> 1179101516 +0200
committer Willy Tarreau <w@1wt.eu> 1179101516 +0200

Merge branch 'pools' into merge-pools