[SCM] terminatorx/master: Merge tag 'upstream/3.90'

[alessio at users.alioth.debian.org]

Imported Upstream version 3.90
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c961632d2f4783f5185826b5146fc17a82d88adc
X-Git-Newrev: 29f6e107f3e2796e4b0e5fb51e26787ee2913ec8

The following commit has been merged in the master branch:
commit 29f6e107f3e2796e4b0e5fb51e26787ee2913ec8
Merge: 3cf0ff1bae0e86cc739920b746c03cb760f624b3 758c51c95ee3e142c04c2893799aa0c749beb2c7
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Mar 7 17:32:29 2014 +0000

    Merge tag 'upstream/3.90'
    
    Upstream version 3.90


-- 
terminatorx packaging