[SCM] japa/master: Merge tag 'upstream/0.8.4'

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

Imported Upstream version 0.8.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5bcc4400127cc6cb21d4f420c7b8e6102685ad00
X-Git-Newrev: 18bc8d119ec3b19d4ee950bcfdcbc9e9a3596ef6

The following commit has been merged in the master branch:
commit 18bc8d119ec3b19d4ee950bcfdcbc9e9a3596ef6
Merge: 5bcc4400127cc6cb21d4f420c7b8e6102685ad00 70968f0ff1409cd4aa43c6576af1cbcd406c26fb
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Aug 7 02:48:41 2013 +0200

    Merge tag 'upstream/0.8.4'
    
    Upstream version 0.8.4


-- 
japa packaging