[minetest-mod-torches] 04/06: Merge tag 'upstream/5'

[Julien Puydt]

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

jpuydt-guest pushed a commit to branch master
in repository minetest-mod-torches.

commit 477a789e7a41e71653940d6ca33d7c5ea6b5a2eb
Merge: 2216420 d1b7203
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Sun Jun 12 06:58:42 2016 +0200

    Merge tag 'upstream/5'
    
    Upstream version 5

 README.txt             |  15 ++++--
 init.lua               | 142 ++++++++++++++++++++++++++++++++++++++++++++++++-
 models/torch_floor.obj |   5 +-
 models/torch_wall.obj  |  22 ++++----
 4 files changed, 169 insertions(+), 15 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/minetest-mod-torches.git