From: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Date: Tue, 28 Jun 2011 13:39:20 +0000 (+0300)
Subject: Merge commit 'upstream/1.11.2'
X-Git-Tag: archive/raspbian/2.5-2+rpi1^2~216
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=86972ffb9b35b5b88c215dc5b64eef04e15e3ce6;p=mathgl.git

Merge commit 'upstream/1.11.2'

Conflicts:
	autom4te.cache/output.0
	autom4te.cache/output.1
	autom4te.cache/requests
	autom4te.cache/traces.0
	autom4te.cache/traces.1
---

86972ffb9b35b5b88c215dc5b64eef04e15e3ce6