From: Ingo Ruhnke <grumbel@gmail.com>
Date: Wed, 1 Oct 2014 16:43:48 +0000 (+0200)
Subject: Merge branch 'feature/smart-ptr'
X-Git-Url: https://git.octo.it/?p=supertux.git;a=commitdiff_plain;h=26316f3548bc819f817918a79dbee7ce9f7270c5

Merge branch 'feature/smart-ptr'
---

26316f3548bc819f817918a79dbee7ce9f7270c5