Merge pull request #4673 from Razer6/support_restructured_text

author Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Sat, 3 Aug 2013 08:45:51 +0000 (01:45 -0700)

committer Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Sat, 3 Aug 2013 08:45:51 +0000 (01:45 -0700)
author Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sat, 3 Aug 2013 08:45:51 +0000 (01:45 -0700)
committer Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sat, 3 Aug 2013 08:45:51 +0000 (01:45 -0700)
diff --cc doc/install/installation.md
Simple merge
diff --cc doc/update/5.4-to-6.0.md
Simple merge
author	Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
	Sat, 3 Aug 2013 08:45:51 +0000 (01:45 -0700)
committer	Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
	Sat, 3 Aug 2013 08:45:51 +0000 (01:45 -0700)
		1	2
doc/install/installation.md	patch \|	diff1 \|	diff2 \|	blob \| history
doc/update/5.4-to-6.0.md	patch \|	diff1 \|	diff2 \|	blob \| history