[sagenb] 21/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 4fa9ad291a4f84deea4c247eee97207a5cff347b
Merge: 151a0a7 f74a0f0
Author: Robin Martinjak <rob at rmartinjak.de>
Date:   Wed Jul 25 21:10:33 2012 +0200

    Merge branch 'master' into ldap

 INSTALL.rst                         | 43 +++++++++++++++++++++++++++++++
 sagenb/data/sage/css/main.css       | 50 ++++++++++++++++++-------------------
 sagenb/data/sage/js/notebook_lib.js |  2 +-
 3 files changed, 69 insertions(+), 26 deletions(-)

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