From: Christoph Lohmann <20h@r-36.net>
Date: Sun, 2 Dec 2012 21:48:41 +0000 (+0100)
Subject: Resolving some conflicts in the shortcuts.
X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=760f8f36debebd5a6fd16100e9876df3b9994647;hp=760f8f36debebd5a6fd16100e9876df3b9994647;p=surf.git

Resolving some conflicts in the shortcuts.
---