[SCM] stk/master: Merge tag 'upstream/4.5.0'

[fsateler at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit e0030f0b768a89b30cbaf346a721e2849ff14d6d
Merge: f7ee8e93e2edd01a6d6daef2694c76e43a874b0a 5ef7f1a4e2736e1511afae0a442ace575c884d20
Author: Felipe Sateler <fsateler at debian.org>
Date:   Fri Jun 6 13:31:48 2014 -0400

    Merge tag 'upstream/4.5.0'
    
    Upstream version 4.5.0
    
    Conflicts:
    	.gitignore


-- 
stk packaging