[SCM] mp3fs/master: Merge commit 'upstream/0.31'

[alessio at users.alioth.debian.org]

Imported Upstream version 0.31
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 642d7f80f1313ec56db44a26d5fe1a47a7241ef5
X-Git-Newrev: c07855f283c14b78104cd26d9df02659ef3177fc

The following commit has been merged in the master branch:
commit fd1aae99a2f7e39ffa43e712c2bbcdf963eb93a5
Merge: 642d7f80f1313ec56db44a26d5fe1a47a7241ef5 7066b6714bc94badf612d191897d35c2b1e1e8a2
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Dec 16 09:57:58 2011 +0100

    Merge commit 'upstream/0.31'


-- 
mp3fs packaging