[sagenb] 47/179: Merge branch 'master' 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 3414baf69e320ae45d523b4a29fbf30e27c935fa
Merge: 6b657ff e11c433
Author: Robin Martinjak <rob at rmartinjak.de>
Date:   Mon Jan 14 22:31:17 2013 +0100

    Merge branch 'master' into ldap

 flask_version/worksheet_listing.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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