Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin

Conflicts:
	docs/source/siteadmin/media-types.rst

1 files changed, 2 insertions, 0 deletions

diff --git a/mediagoblin/tools/url.py b/mediagoblin/tools/url.py
index 7477173a..de16536c 100644
--- a/mediagoblin/tools/url.py
+++ b/mediagoblin/tools/url.py
@@ -15,6 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import re
+# This import *is* used; see word.encode('tranlit/long') below.
 import translitcodec
 
 
@@ -27,6 +28,7 @@ def slugify(text, delim=u'-'):
     """
     result = []
     for word in _punct_re.split(text.lower()):
+        # Uses translitcodec!
         word = word.encode('translit/long')
         if word:
             result.append(word)