From: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Date: Sun, 1 Apr 2012 03:02:18 +0000 (+0300)
Subject: Merge tag 'upstream/2_rc2+svn400' into experimental
X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~193^2~7^2~14
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f9dccb31b65ddc12d891297f21ead219aacdad36;p=mathgl.git

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

Upstream version 2~rc2+svn400

Conflicts:
	lang/CMakeLists.txt
---

f9dccb31b65ddc12d891297f21ead219aacdad36