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, 1 insertions, 1 deletions

diff --git a/sx-favorites.el b/sx-favorites.el
index e8155ea..7fdc772 100644
--- a/sx-favorites.el
+++ b/sx-favorites.el
@@ -1,4 +1,4 @@
-;;; sx-favorites.el --- starred questions          -*- lexical-binding: t; -*-
+;;; sx-favorites.el --- starred questions            -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2014  Sean Allred