[minetest-mod-nether.git] 02/03: Merge tag 'upstream/2'

[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-nether.git.

commit 61f0efa204d105a54ebd1063cf435ae29b8ca272
Merge: 4a7394f fea1c76
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Tue Jun 14 12:31:57 2016 +0200

    Merge tag 'upstream/2'
    
    Upstream version 2

 depends.txt                  |   1 +
 init.lua                     | 110 ++++++++++++++++++++++++++++---------------
 schematics/nether_portal.mts | Bin 0 -> 87 bytes
 3 files changed, 74 insertions(+), 37 deletions(-)

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