From: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Date: Sun, 23 Mar 2014 22:59:56 +0000 (+0200)
Subject: Merge tag 'upstream/2.2.2.1'
X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~135
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=90d9fb461900459418d7480b76a9bf8878447a07;p=mathgl.git

Merge tag 'upstream/2.2.2.1'

Upstream version 2.2.2.1

Conflicts:
	CMakeLists.txt
---

90d9fb461900459418d7480b76a9bf8878447a07