]> granicus.if.org Git - pgbouncer/commitdiff
Merge remote-tracking branch 'ccutrer/dev/nxdomain_ttl'
authorMarko Kreen <markokr@gmail.com>
Mon, 7 Oct 2013 21:02:44 +0000 (00:02 +0300)
committerMarko Kreen <markokr@gmail.com>
Mon, 7 Oct 2013 21:02:44 +0000 (00:02 +0300)
1  2 
src/main.c

diff --cc src/main.c
Simple merge