[SCM] frei0r/master: Merge tag 'upstream/1.3'

[js at users.alioth.debian.org]

Imported Upstream version 1.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 76cc31ee43f6d9e07df7bc99e0def8c6b4a5350d
X-Git-Newrev: 4a5b5d1062d37a6d9222e7db10db55f02ede945a

The following commit has been merged in the master branch:
commit 2552e0f7ab46026b946772e33754441fa84f528a
Merge: 6366c5b1b9bb2529704818632cf90d1267b38b14 41eb4545dc1fb016cb03785e9c073ee9b58a4bf7
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Dec 25 20:55:45 2012 +0100

    Merge tag 'upstream/1.3'
    
    Upstream version 1.3
    
    # gpg: Signature made tir 25 dec 2012 20:55:42 CET using RSA key ID C1A00121
    # gpg: Good signature from "Jonas Smedegaard <dr at jones.dk>"
    # gpg:                 aka "Jonas Smedegaard <jonas at homebase.dk>"
    # gpg:                 aka "Jonas Smedegaard <js at debian.org>"
    # gpg:                 aka "Jonas Smedegaard <jonas at dgi-huset.dk>"
    # gpg:                 aka "Jonas Smedegaard <jonas at 107b.dk>"
    # gpg:                 aka "[jpeg image of size 4165]"


-- 
frei0r packaging