[geogebra] 02/03: Merge branch 'master' into build

[Giovanni Mascellani]

This is an automated email from the git hooks/post-receive script.

gio pushed a commit to branch build
in repository geogebra.

commit 558d0a4c6a57382f6315144eeddfe19165a74722
Merge: b08bd5a a7536d7
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Tue Aug 5 22:15:07 2014 +0200

    Merge branch 'master' into build

 debian/changelog | 12 ++++++++++++
 debian/compat    |  2 +-
 debian/control   | 12 ++++++------
 debian/rules     |  3 ++-
 4 files changed, 21 insertions(+), 8 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/geogebra.git