[sagenb] 54/157: Merge branch 'master' of https://github.com/sagemath/sagenb

[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 016308ea93ed0803c44afd55d1bb34daca25a3db
Merge: f5d5e31 aea94ee
Author: Karl-Dieter Crisman <kcrisman at gmail.com>
Date:   Tue Sep 16 17:01:45 2014 -0400

    Merge branch 'master' of https://github.com/sagemath/sagenb

 HACKING.rst | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

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