From: Max Kellermann <max@duempel.org>
Date: Wed, 4 Jan 2012 19:21:11 +0000 (+0100)
Subject: Merge remote branches 'jn/keydef' and 'jn/dev'
X-Git-Tag: release-0.20~10
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0d9ec668b22535ba40fbcd4f15ee2fa13e6048ea;p=ncmpc.git

Merge remote branches 'jn/keydef' and 'jn/dev'
---

0d9ec668b22535ba40fbcd4f15ee2fa13e6048ea