git.samba.org - jelmer/ctrlproxy.git/commit

author	Jelmer Vernooij <jelmer@samba.org>
	Fri, 10 Apr 2009 15:29:15 +0000 (17:29 +0200)
committer	Jelmer Vernooij <jelmer@samba.org>
	Fri, 10 Apr 2009 15:29:15 +0000 (17:29 +0200)
commit	2e27d1f8c2401d76ff486662ef49aa724e713b43
tree	4f8ff78564df4db0797e8fb6967a87c6052fc78f	tree
parent	2abf861ac5fa26d9fc214d413037605029051228	commit \| diff
parent	4418fba7d48825dce60d5692cee318a2eb1238a6	commit \| diff

Merge trunk.

Unnamed repository; edit this file 'description' to name the repository.