From: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Date: Sun, 23 Feb 2014 16:53:03 +0000 (+0200)
Subject: Merge tag 'upstream/2.2.1+svn921'
X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~144
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=543e89e085de1eeb649f447cd11c27b3f96b2c19;p=mathgl.git

Merge tag 'upstream/2.2.1+svn921'

Upstream version 2.2.1+svn921

Conflicts:
	CMakeLists.txt
---

543e89e085de1eeb649f447cd11c27b3f96b2c19