[Pkg-openldap-devel] [openldap] 02/03: Merge branch 'upstream'

[Ryan Tandy]

This is an automated email from the git hooks/post-receive script.

rtandy-guest pushed a commit to branch master
in repository openldap.

commit 8216d78ea055672856d0cb9de6849dbeba06dd28
Merge: 93fc673 9114f11
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Wed Mar 11 14:56:14 2015 -0700

    Merge branch 'upstream'

 servers/slapd/schema/inetorgperson.schema | 155 ------------------------------
 1 file changed, 155 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git