[SCM] swh-lv2/master: Merge commit 'upstream/1.0.15+20111107.gitec6b85e'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.0.15+20111107.gitec6b85e
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 89a9de615efb7b6d7cdd2e134888b18b7fe6a253
X-Git-Newrev: 39e708dca526ff8d0df4f4d7c2eb35e360840119

The following commit has been merged in the master branch:
commit 39e708dca526ff8d0df4f4d7c2eb35e360840119
Merge: 89a9de615efb7b6d7cdd2e134888b18b7fe6a253 c11d29f1db96e934c13cf5bc5728c8e9c71a99b2
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Dec 5 00:11:27 2011 +0100

    Merge commit 'upstream/1.0.15+20111107.gitec6b85e'


-- 
swh-lv2 packaging