From: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Date: Tue, 28 Jan 2014 18:26:49 +0000 (+0200)
Subject: Merge tag 'upstream/2.2.1' into experimental
X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~151^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d92f34aa02b61e20adc9fd8d0f7fca725015fd60;p=mathgl.git

Merge tag 'upstream/2.2.1' into experimental

Upstream version 2.2.1

Conflicts:
	CMakeLists.txt
---

d92f34aa02b61e20adc9fd8d0f7fca725015fd60