[SCM] caps/master: Merge tag 'upstream/0.9.21'

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

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

The following commit has been merged in the master branch:
commit b536baefa6dd7b689171c6648cc00c25ef5fecfb
Merge: 801f1cecca048c0e71920c8aa5fada5b92dc6505 1631ebb380561a2a615c151f81d46cb97741d777
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Feb 20 23:03:09 2014 +0100

    Merge tag 'upstream/0.9.21'
    
    Upstream version 0.9.21


-- 
caps packaging