[sagenb] 20/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 0462c452d1aea9ccd1dbfb73d192042a1f2c7af9
Merge: 533a00c 151a0a7
Author: Robin Martinjak <rob at rmartinjak.de>
Date:   Mon Jul 16 00:17:12 2012 +0200

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

 sagenb/notebook/auth.py         | 2 +-
 sagenb/notebook/user_manager.py | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

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