[sagenb] 22/179: Merge branch 'ldap' of ssh://github.com/rmartinjak/sagenb into ldap

[felix salfelder]

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

felix-guest pushed a commit to branch master
in repository sagenb.

commit 28ce8d7a2e2e0e804a19f1b93bdc14ce27a1138d
Merge: 4fa9ad2 0462c45
Author: Robin Martinjak <rob at rmartinjak.de>
Date:   Wed Jul 25 21:11:32 2012 +0200

    Merge branch 'ldap' of ssh://github.com/rmartinjak/sagenb into ldap


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git