[SCM] tap-plugins-doc/master: Merge tag 'upstream/20140526'

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

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

The following commit has been merged in the master branch:
commit 21ceee7896bcaa2c78e75bae31da3a0438724253
Merge: ea92321743333645c1f1f267689a77c68c79b7d5 0b0d677025447636039ad27f8e09239c76e9f733
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Jun 5 23:46:59 2014 +0200

    Merge tag 'upstream/20140526'
    
    Upstream version 20140526
    
    # gpg: Signature made Thu 05 Jun 2014 11:46:55 PM CEST using RSA key ID E2B84FA5
    # gpg: Good signature from "Jaromír Mikeš <mira.mikes at seznam.cz>"
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: 4A54 3513 D2DF 6351 A817  8EA3 5B01 9455 E2B8 4FA5


-- 
tap-plugins-doc packaging