From: Ingo Ruhnke <grumbel@gmail.com>
Date: Mon, 25 Aug 2014 07:52:57 +0000 (+0200)
Subject: Merge branch 'feature/addon-manager'
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=5066ad643acd01cf885d1cc93ad5aa6466520de2;hp=2b303a8b914022a0145dffa40aec8c213c5f8623;p=supertux.git

Merge branch 'feature/addon-manager'
---