[sagenb] 11/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 630fd646e86af4c888292525b6cfbc8a3f0e247c
Merge: f40903b bf34867
Author: Robin Martinjak <rob at rmartinjak.de>
Date:   Fri Jun 22 22:47:40 2012 +0200

    Merge branch 'master' into ldap

 .hgignore                                |  74 ---------
 MANIFEST.in                              |  16 +-
 Makefile                                 |  37 -----
 README.rst                               |  73 +++++++++
 SPKG.txt                                 |  98 ------------
 dist.sh                                  |  58 +++++++
 go                                       |   7 -
 sagenb/data/sage/html/notebook/cell.html |   7 +-
 sagenb/data/sage/js/notebook_lib.js      |   5 +
 sass/src/main.scss                       |   2 +-
 sdist                                    |  36 -----
 setup.py                                 |  97 ++++++------
 spkg-dist                                | 257 -------------------------------
 util/fetch_deps.py                       |  51 ++++++
 14 files changed, 249 insertions(+), 569 deletions(-)

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