[sagenb] 23/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 71720d64dc884ce16bca1d8531d9174d53c60a29
Merge: 0462c45 f74a0f0
Author: Robin Martinjak <rob at rmartinjak.de>
Date:   Thu Jul 26 17:23:19 2012 +0200

    Merge branch 'master' into ldap

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

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