]> git.sur5r.net Git - openldap/commitdiff
Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap
authorRein Tollevik <rein@basefarm.no>
Mon, 27 Jun 2011 12:21:35 +0000 (14:21 +0200)
committerRein Tollevik <rein@basefarm.no>
Mon, 27 Jun 2011 12:21:35 +0000 (14:21 +0200)

Trivial merge