Debug blocks borders
Merge remote-tracking branch 'upstream/master' into blockframe
Disable.
Merge remote-tracking branch 'upstream/master' into con
Farmesh improve: save&reuse meshes with all steps
Normal maps generation on the fly.
Parallax mapping with slope information.
Overriding normal maps.
Fix serializing of signed numbers in serializeStructToString
Merge remote-tracking branch 'upstream/master' into con
Merge remote-tracking branch 'minetest/master'

Conflicts:
	builtin/mainmenu.lua
	client/shaders/alpha_shader/opengl_fragment.glsl
	client/shaders/leaves_shader/opengl_fragment.glsl
	client/shaders/liquids_shader/opengl_fragment.glsl
	client/shaders/liquids_shader/opengl_vertex.glsl
	client/shaders/plants_shader/opengl_fragment.glsl
	client/shaders/solids_shader/opengl_fragment.glsl
include the yum install command for fedora

took me a while to find out that `libjpeg-dev` on debian was `libjpeg-turbo-devel` on fedora >.>
Merge pull request #60 from asl97/patch-2

include the yum install command for fedora
Merge remote-tracking branch 'upstream/master' into con