From: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Date: Tue, 27 Mar 2012 16:23:46 +0000 (+0300)
Subject: Merge tag 'upstream/2_rc2+svn387' into experimental
X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~193^2~7^2~16
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=95272859bf1e18bf7b93c2cfea8ab4e1893a72e8;p=mathgl.git

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

Upstream version 2~rc2+svn387

Conflicts:
	lang/CMakeLists.txt
---

95272859bf1e18bf7b93c2cfea8ab4e1893a72e8