[sagenb] 39/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 7e2b172615fc8d1fd6c7cac210332f2d13c7025a
Merge: 470094e 6a42da6
Author: Robin Martinjak <rob at rmartinjak.de>
Date:   Fri Nov 23 00:56:26 2012 +0100

    Merge branch 'master' into ldap

 flask_version/base.py | 2 +-
 setup.py              | 2 +-
 util/fetch_deps.py    | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

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