Merge branch 'master' into next

sigma · sigma · commit 190a5f77fef9 · 2015-01-26T12:41:33.000-08:00
Conflicts:
	Makefile
	gh-gist.el
diff --git a/docs/build/html b/docs/build/html
@@ -1 +1 @@
-Subproject commit 2f962975e62520ec726b1a7640003bd4641714b1
+Subproject commit efe211db5f857de198869d43fd600f956940d66a
