Code

Merge remote branches 'jn/keydef' and 'jn/dev'
authorMax Kellermann <max@duempel.org>
Wed, 4 Jan 2012 19:21:11 +0000 (20:21 +0100)
committerMax Kellermann <max@duempel.org>
Wed, 4 Jan 2012 19:21:11 +0000 (20:21 +0100)
1  2 
src/command.c

diff --cc src/command.c
Simple merge