[SCM] osceleton/master: Merge tag 'upstream/1.1'

[eighthave at users.alioth.debian.org]

Imported Upstream version 1.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: d6f2903d10d7e55a550e9923009f2b8a3fc2017a
X-Git-Newrev: eb781b0b56f8d54cb0863b9b1f545188d61eb026

The following commit has been merged in the master branch:
commit b188623d192449c0fd05f90b3b05046b1d8bafdf
Merge: 9b6bdeb68a434653da04aadb73c95e0949084f2d b0ab07f97199cb16482639d88464e67f955b33d6
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Mon May 20 12:59:31 2013 -0400

    Merge tag 'upstream/1.1'
    
    Upstream version 1.1
    # gpg: Signature made Mon 20 May 2013 12:59:28 PM EDT using RSA key ID 374BBE81
    # gpg: Good signature from "Hans-Christoph Steiner <hans at at.or.at>"
    # gpg:                 aka "[jpeg image of size 5408]"
    # gpg:                 aka "Hans-Christoph Steiner <hs420 at nyu.edu>"
    # gpg:                 aka "Hans-Christoph Steiner <hans at eds.org>"
    # gpg:                 aka "Hans-Christoph Steiner <hans at guardianproject.info>"
    # gpg:                 aka "Hans-Christoph Steiner <hansi at nyu.edu>"
    # gpg:                 aka "Hans-Christoph Steiner <hans at guardianproject.info>"


-- 
osceleton packaging