From: Daniel Carl <danielcarl@gmx.de>
Date: Sun, 20 Oct 2013 12:25:31 +0000 (+0200)
Subject: Merge branch 'new-key-handling'
X-Git-Url: https://git.owens.tech/assets/static/git.owens.tech/assets/static/git.owens.tech/git?a=commitdiff_plain;h=bc6f5118ede1d8929b8216a585ba2e8bfc0e9336;p=vimb.git

Merge branch 'new-key-handling'

Conflicts:
	src/command.c
	src/main.c
---

bc6f5118ede1d8929b8216a585ba2e8bfc0e9336