From: Max Kellermann <max@duempel.org>
Date: Wed, 31 Aug 2011 13:59:47 +0000 (+0200)
Subject: Merge remote branches 'jn/doc', 'jn/stuff' and 'jn/stuff1'
X-Git-Tag: release-0.20~95
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=acf6c5a702380aaa683462660a192fa880122d5d;p=ncmpc.git

Merge remote branches 'jn/doc', 'jn/stuff' and 'jn/stuff1'
---

acf6c5a702380aaa683462660a192fa880122d5d