[SCM] glyr/master: Merge tag 'upstream/1.0.1'

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

Imported Upstream version 1.0.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 96db78355a5b7ed3d1ea30de805e5c708e5354b2
X-Git-Newrev: 25ba84b5773097bdc8c546346be21b4106803fa8

The following commit has been merged in the master branch:
commit 3c6486ca2836fc46c59cd3c4bb8a65d4abdb0b69
Merge: d1afee9da4988fe4b195db610ad248783e4c67e2 01c9cbe6f304727e4b49626462c321313f6cc956
Author: Etienne Millon <me at emillon.org>
Date:   Wed Apr 3 00:47:02 2013 +0200

    Merge tag 'upstream/1.0.1'
    
    Upstream version 1.0.1
    
    * tag 'upstream/1.0.1':
      Imported Upstream version 1.0.1


-- 
glyr packaging