[sagenb] 14/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 3c33d535693d572d062aee0e91c4bc742c0b8084
Merge: 3886d6d b64d6fd
Author: Robin Martinjak <rob at rmartinjak.de>
Date:   Wed Jul 11 00:28:16 2012 +0200

    Merge branch 'master' into ldap

 sagenb/notebook/cell.py      | 26 +++++++++++++-------------
 sagenb/notebook/worksheet.py |  2 +-
 setup.py                     |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

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