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

diff --cc mediagoblin/db/models.py
Simple merge

diff --cc mediagoblin/util.py
index 1e8fa095a0a7890ac47e044ca9c05cb9af569a20,fc380f4120f617473efe0e9e90994bdcd2fb662b..eb13183042608fc0ff382b172deb9a755c1a6ca8
--- 1/mediagoblin/util.py
--- 2/mediagoblin/util.py
+++ b/mediagoblin/util.py
@@@ -30,10 -30,12 +30,11 @@@ import jinja
  import translitcodec
  from paste.deploy.loadwsgi import NicerConfigParser
  from webob import Response, exc
+ from lxml.html.clean import Cleaner
  
- from mediagoblin import globals as mgoblin_globals
+ from mediagoblin import mg_globals
  from mediagoblin.db.util import ObjectId
  
 -
  TESTS_ENABLED = False
  def _activate_testing():
      """
@@@ -98,11 -100,11 +99,11 @@@ def get_jinja_env(template_loader, loca
  
      template_env = jinja2.Environment(
          loader=template_loader, autoescape=True,
 -        extensions=['jinja2.ext.i18n'])
 +        extensions=['jinja2.ext.i18n', 'jinja2.ext.autoescape'])
  
      template_env.install_gettext_callables(
-         mgoblin_globals.translations.gettext,
-         mgoblin_globals.translations.ngettext)
+         mg_globals.translations.gettext,
+         mg_globals.translations.ngettext)
  
      if exists(locale):
          SETUP_JINJA_ENVS[locale] = template_env