From: root <root@e4.alt.org>
Date: Sat, 2 Jan 2016 19:54:25 +0000 (+0000)
Subject: Merge branch 'master' of git://github.com/paxed/dgamelaunch
X-Git-Tag: v1.6.1-roc-dev~56
X-Git-Url: https://skyeroc.xyz/gitweb/?a=commitdiff_plain;h=f7c8a07806a715eca75f10b8b0ddf84713944c88;p=dgamelaunch

Merge branch 'master' of git://github.com/paxed/dgamelaunch
---

f7c8a07806a715eca75f10b8b0ddf84713944c88