Merge branch 'master' into errorstate
authorSamuel Cormier-Iijima <sciyoshi@gmail.com>
Sun, 2 Mar 2008 01:21:49 +0000 (20:21 -0500)
committerSamuel Cormier-Iijima <sciyoshi@gmail.com>
Sun, 2 Mar 2008 01:21:49 +0000 (20:21 -0500)
commit5183a9b80c8a22531948af76f4433f0a1a510cbc
tree4759c87673cbf6bd9564be23465fb06441097ed3
parent914c20945d3f0b9460447fb2e44a493ba4debc63
parente7aa65fdc44e1989fd837b56db4af59c765f8489
Merge branch 'master' into errorstate

Conflicts:

gnio/gnio.h
gnio/Makefile.am
gnio/gnio.h
gnio/gsocket.h
gnio/gtcpclient.c