[sagenb] 48/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 714ac4f8e9db40c1bf07974fbc4191d1bcb23bde
Merge: 3414baf 4648948
Author: Robin Martinjak <rob at rmartinjak.de>
Date:   Thu Jan 17 11:52:56 2013 +0100

    Merge branch 'master' into ldap

 HACKING.rst                 | 66 +++++++++++++++++++++++++++++++++++++++++++++
 INSTALL.rst                 | 57 +++++++++++++--------------------------
 sagenb/misc/sphinxify.py    | 24 ++++++++++++++---
 sagenb/misc/support.py      | 16 ++++++++---
 sagenb/notebook/interact.py |  2 ++
 setup.py                    |  2 +-
 6 files changed, 119 insertions(+), 48 deletions(-)

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