Merge branch 'master' of git://repo.or.cz/clientserver
commit01ef76e77733cf54c7e00c3f56a813ac68c7fca3
authorvictor <victor.zamanian@gmail.com>
Wed, 3 Oct 2007 20:16:07 +0000 (3 22:16 +0200)
committervictor <victor.zamanian@gmail.com>
Wed, 3 Oct 2007 20:16:07 +0000 (3 22:16 +0200)
tree41f9d0ef3444926d8b4b316e5ade63bcb173f291
parent044009ac61ba569aac8bb83b5f9e073ad958e7c5
parent739b196bd2a3c6d8bab3068506aee2415c30e623
Merge branch 'master' of git://repo.or.cz/clientserver