[sagenb] 32/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 faf600edc0f2c73e3a25b032d64c032b68fce316
Merge: df215ce adcd348
Author: Robin Martinjak <rob at rmartinjak.de>
Date:   Tue Oct 30 14:11:03 2012 +0100

    Merge branch 'master' into ldap

 sagenb/data/graph_editor/graph_editor.html | 2 +-
 sagenb/notebook/run_notebook.py            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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