new: usr: Keymap for /msg command
chg: dev: setPromt() clears prompt before setting it
Merge pull request #142 from donat-b/at

Keymap for /msg command
Fix dig glitch when no THREAD_LOCAL avail
chg: correct CONTENT_* values
fix: c++11 features detect
fix: comment
Merge remote-tracking branch 'upstream/master' into next

Conflicts:
	src/CMakeLists.txt
	src/mapblock.cpp
Merge remote-tracking branch 'upstream/master' into next
new: config: Adjustable number of reconnects
Fix: layers
fix: layers in math mapgen
fis: object shadows
fix
Revert "chg: correct CONTENT_* values"

This reverts commit 22d6f7f8e19ddb5680889b0963907ce76fc253bc.
Merge remote-tracking branch 'upstream/master' into next
Revert "Revert "chg: correct CONTENT_* values""

This reverts commit f0845e88abe786c84f24774a2b37a4c2d1900b0d.
Merge remote-tracking branch 'freeminer/next' into freeminer_next