[SCM] glyr/master: Merge tag 'upstream/1.0.2' into newmast

[emillon-guest at users.alioth.debian.org]

Imported Upstream version 1.0.2
Imported Upstream version 1.0.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 772977f347a2f364f6fb541995ab9a8dab46bd71
X-Git-Newrev: 26af77acb07195d044f05f11b3bd023f682dc970

The following commit has been merged in the master branch:
commit edd75fedb89b8e0dfce5a471ff114401abaf8429
Merge: bc998fe61dead7f00936ddb6e7a2493559809295 8620cc3987ec76c64fcc586426bed11596974abe
Author: Etienne Millon <me at emillon.org>
Date:   Sat Dec 7 19:17:08 2013 +0100

    Merge tag 'upstream/1.0.2' into newmast
    
    Upstream version 1.0.2
    
    # gpg: Signature faite le sam. 07 déc. 2013 19:17:04 CET avec la clef RSA d'identifiant EC1663E5
    # gpg: Bonne signature de « Etienne Millon <me at emillon.org> »
    # gpg:                 alias « Etienne Millon <etienne.millon at gmail.com> »
    
    * tag 'upstream/1.0.2':
      Imported Upstream version 1.0.2
      Imported Upstream version 1.0.2


-- 
glyr packaging