From: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Date: Tue, 12 Feb 2013 17:55:58 +0000 (+0200)
Subject: Merge tag 'upstream/2.1.2' into experimental
X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~151^2~39
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=71618f5b23d36b77eb35ac4a69b2a46c35e003c7;p=mathgl.git

Merge tag 'upstream/2.1.2' into experimental

Upstream version 2.1.2

Conflicts:
	CMakeLists.txt
---

71618f5b23d36b77eb35ac4a69b2a46c35e003c7