[sagenb] 24/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 cd6ef1445846146c8c867e765daa9ebda1d21a97
Merge: 71720d6 28ce8d7
Author: Robin Martinjak <rob at rmartinjak.de>
Date:   Thu Jul 26 17:23:53 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