From: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Date: Thu, 22 Mar 2012 19:44:53 +0000 (+0200)
Subject: Merge tag 'upstream/2_rc2+svn376' into experimental
X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~193^2~7^2~27
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=affb017a7a7c74d3b3bffb7e48300aa8694ab18a;p=mathgl.git

Merge tag 'upstream/2_rc2+svn376' into experimental

Upstream version 2~rc2+svn376

Conflicts:
	texinfo/CMakeLists.txt
---

affb017a7a7c74d3b3bffb7e48300aa8694ab18a