From: Rein Tollevik Date: Mon, 27 Jun 2011 12:21:35 +0000 (+0200) Subject: Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ffa8eca405e10d2c013af10a4a30aac70e9e1de4;p=openldap Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap --- ffa8eca405e10d2c013af10a4a30aac70e9e1de4