[m-tx] 02/03: Merge tag 'upstream/0.60d.ctan20131214'

[Norbert Preining <preining@moszumanska.debian.org>]

This is an automated email from the git hooks/post-receive script.

preining pushed a commit to branch master
in repository m-tx.

commit 44da8f10a180a82e4b4143989564cf1b2989b1dd
Merge: 913b860 3151900
Author: Norbert Preining <preining@debian.org>
Date:   Sat Dec 14 12:06:28 2013 +0900

    Merge tag 'upstream/0.60d.ctan20131214'
    
    Upstream version 0.60d.ctan20131214
    
    # gpg: Signature made Sat 14 Dec 2013 12:06:23 PM JST using DSA key ID 09C5B094
    # gpg: Good signature from "Norbert Preining <preining@debian.org>"
    # gpg:                 aka "Norbert Preining <preining@logic.at>"

 README                                             |  4 ++--
 doc/generic/m-tx/README                            |  4 ++--
 doc/generic/m-tx/m-tx.1                            |  9 ++++++++-
 doc/generic/m-tx/m-tx.html                         | 14 ++++++++++++--
 doc/generic/m-tx/mtx060/{README => README.M-Txdoc} |  0
 scripts/m-tx/m-tx.lua                              | 11 +++++++++++
 6 files changed, 35 insertions(+), 7 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/m-tx.git