[SCM] branch, master, updated. debian/0.25-1-5-gfb30da4

Mon Apr 22 05:51:25 UTC 2013

The following commit has been merged in the master branch:
commit cad38485142f509a63b9a837408e90b9b4e14c9c
Merge: 5c5156da7d29d750ad4a83063af52fea87307dbd 0fbfc571387f337a3b0476f46ca18e40ce8f60d9
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Mon Apr 22 07:21:21 2013 +0200

    Merge tag 'upstream/0.26'
    
    Upstream version 0.26


--