[geogebra] 01/06: Merge remote-tracking branch 'origin/master', discarding all modificatins.

[Giovanni Mascellani]

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

gio pushed a commit to branch master
in repository geogebra.

commit 08060b7e21a0076b4d418f7801c983cd34a829bf
Merge: a445286 0458a12
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Tue Aug 5 21:58:09 2014 +0200

    Merge remote-tracking branch 'origin/master', discarding all modificatins.


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