Merge branch 'master' into 0.5

alexey · alexey · commit afe0aa2c8db3 · 2015-12-28T12:10:39.000+02:00
Conflicts:
	mkdocs.yml
	theme/readthedocs/base.html
	theme/readthedocs/versions.html
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -59,5 +59,6 @@ pages:
 #current_version: master
 versions:
    releases:
-      - master
+      - 0.6
       - 0.5
+
