commit cf49e43f86de16f1cc84ab44f6d4fa3c7e18902f Merge: cd1f718 0adef98 Author: Kurt Zeilenga kurt@OpenLDAP.org Date: Mon Mar 28 18:42:22 2011 -0700
Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap
We'll need better messages for merges, this doesn't say much.