Merge branch 'new-key-handling'
authorDaniel Carl <danielcarl@gmx.de>
Sun, 20 Oct 2013 12:25:31 +0000 (14:25 +0200)
committerDaniel Carl <danielcarl@gmx.de>
Sun, 20 Oct 2013 12:25:31 +0000 (14:25 +0200)
commitbc6f5118ede1d8929b8216a585ba2e8bfc0e9336
tree3a7cef04708bc511f2ad6846aa610bf3608bd366
parent383e6980a59bd0a396f3f29077aeede0e89f6c37
parentaeed2b0fabb7458ce6c2ba35c1400ad561eb1391
Merge branch 'new-key-handling'

Conflicts:
src/command.c
src/main.c
config.mk