From: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Date: Sun, 10 Aug 2014 20:23:26 +0000 (+0300)
Subject: Merge tag 'upstream/2.3'
X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~125
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b3cafc88a489a1a0c325b7d39cd9756a79351cae;p=mathgl.git

Merge tag 'upstream/2.3'

Upstream version 2.3

Conflicts:
	CMakeLists.txt
---

b3cafc88a489a1a0c325b7d39cd9756a79351cae