Merge branch 'organize' of github.com:vermiculus/sx.el into organize

Conflicts:
	sx-cache.el
	sx-encoding.el
	sx-favorites.el
	sx-filter.el
	sx-interaction.el
	sx-method.el
	sx-question-list.el
	sx-question-mode.el
	sx-question-print.el
	sx-question.el
	sx-tab.el
	sx-time.el
	sx.el

1 files changed, 5 insertions, 1 deletions

diff --git a/sx-interaction.el b/sx-interaction.el
index acb4a77..4d71c17 100644
--- a/sx-interaction.el
+++ b/sx-interaction.el
@@ -1,4 +1,4 @@
-;;; sx-interaction.el --- voting, commenting, and otherwise interacting with questions  -*- lexical-binding: t; -*-
+;;; sx-interaction.el --- voting, commenting, and other interaction  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2014  Artur Malabarba
 
@@ -443,3 +443,7 @@ context at point. "
 
 (provide 'sx-interaction)
 ;;; sx-interaction.el ends here
+
+;; Local Variables:
+;; indent-tabs-mode: nil
+;; End: