From: Mathnerd314 <mathnerd314.gph+hs@gmail.com>
Date: Sun, 3 Aug 2014 18:33:52 +0000 (+0200)
Subject: Merge branch 'master' of https://code.google.com/p/supertux
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=3bdde1dc2696340bee5f52dea1d8f288700f62b9;p=supertux.git

Merge branch 'master' of https://code.google.com/p/supertux

Conflicts:
	CMakeLists.txt
---

3bdde1dc2696340bee5f52dea1d8f288700f62b9