mediagoblin.git
12 years agoAdd translation brackety things to forgot-password page, I forgot those
Jef van Schendel [Fri, 4 Nov 2011 01:15:52 +0000 (02:15 +0100)]
Add translation brackety things to forgot-password page, I forgot those

12 years agoText changes to forgot-paddword page
Jef van Schendel [Fri, 4 Nov 2011 01:14:19 +0000 (02:14 +0100)]
Text changes to forgot-paddword page

12 years agoText changes to front page, as described in ticket #637
Jef van Schendel [Fri, 4 Nov 2011 01:06:33 +0000 (02:06 +0100)]
Text changes to front page, as described in ticket #637

12 years agoSeveral small changes (reordering/restyling) for media descriptions and comments
Jef van Schendel [Fri, 4 Nov 2011 00:54:41 +0000 (01:54 +0100)]
Several small changes (reordering/restyling) for media descriptions and comments

12 years agoCorrecting the mediagoblin static/media aliases in the deployment guide
Christopher Allan Webber [Thu, 3 Nov 2011 22:10:39 +0000 (17:10 -0500)]
Correcting the mediagoblin static/media aliases in the deployment guide

12 years agoA correct but compact set of instructions for fastcgi on nginx
Christopher Allan Webber [Thu, 3 Nov 2011 15:59:47 +0000 (10:59 -0500)]
A correct but compact set of instructions for fastcgi on nginx

12 years agoIndentation was off by one ;)
Christopher Allan Webber [Thu, 3 Nov 2011 15:27:39 +0000 (10:27 -0500)]
Indentation was off by one ;)

12 years agoWe left out a critical fastcgi variable from the nginx config
Christopher Allan Webber [Thu, 3 Nov 2011 15:23:53 +0000 (10:23 -0500)]
We left out a critical fastcgi variable from the nginx config

12 years agoRecommendation to install flup!
Christopher Allan Webber [Thu, 3 Nov 2011 14:41:48 +0000 (09:41 -0500)]
Recommendation to install flup!

12 years ago0.1.0, also in the docs file! ;)
Christopher Allan Webber [Wed, 2 Nov 2011 14:09:35 +0000 (09:09 -0500)]
0.1.0, also in the docs file! ;)

12 years ago0.1.0!
Christopher Allan Webber [Wed, 2 Nov 2011 14:08:45 +0000 (09:08 -0500)]
0.1.0!

12 years agoRemoved the bloof print debugging
Christopher Allan Webber [Wed, 2 Nov 2011 13:55:02 +0000 (08:55 -0500)]
Removed the bloof print debugging

12 years agoMake sure you can't force comments on entries that don't exist.
Christopher Allan Webber [Wed, 2 Nov 2011 13:53:33 +0000 (08:53 -0500)]
Make sure you can't force comments on entries that don't exist.

See: http://bugs.foocorp.net/issues/621

12 years agoUpdated logo from Thorsten Wilms!
Christopher Allan Webber [Wed, 2 Nov 2011 04:55:19 +0000 (23:55 -0500)]
Updated logo from Thorsten Wilms!

12 years agoUpdated translations
Christopher Allan Webber [Wed, 2 Nov 2011 04:15:37 +0000 (23:15 -0500)]
Updated translations

12 years agoMinor fixes
Joar Wandborg [Tue, 1 Nov 2011 22:00:35 +0000 (23:00 +0100)]
Minor fixes

- Added error handling for PyGTK import
- Added 'mkv' to the video media manager

12 years agoMerge remote branch 'remotes/j1mc/master'
Christopher Allan Webber [Tue, 1 Nov 2011 04:42:12 +0000 (23:42 -0500)]
Merge remote branch 'remotes/j1mc/master'

12 years agoAdded configuration to the index
Christopher Allan Webber [Tue, 1 Nov 2011 03:42:30 +0000 (22:42 -0500)]
Added configuration to the index

12 years agoA cop-out section for all other config changes
Christopher Allan Webber [Tue, 1 Nov 2011 03:40:39 +0000 (22:40 -0500)]
A cop-out section for all other config changes

12 years agoEnabling email notifications documentation!
Christopher Allan Webber [Tue, 1 Nov 2011 03:26:47 +0000 (22:26 -0500)]
Enabling email notifications documentation!

12 years agodocs - tweaked configuration.rst for style.
Jim Campbell [Tue, 1 Nov 2011 03:20:00 +0000 (22:20 -0500)]
docs - tweaked configuration.rst for style.

12 years agoMaking docs changes per Jim's suggestions.
Christopher Allan Webber [Tue, 1 Nov 2011 03:08:30 +0000 (22:08 -0500)]
Making docs changes per Jim's suggestions.

12 years agoAdded the "making local copies" section to configuration.rst
Christopher Allan Webber [Tue, 1 Nov 2011 03:07:12 +0000 (22:07 -0500)]
Added the "making local copies" section to configuration.rst

12 years agoFirst section of configuring mediagoblin
Christopher Allan Webber [Tue, 1 Nov 2011 02:58:21 +0000 (21:58 -0500)]
First section of configuring mediagoblin

12 years agoConfiguring MediaGoblin, a loose sketch of documentation.
Christopher Allan Webber [Mon, 31 Oct 2011 04:29:06 +0000 (23:29 -0500)]
Configuring MediaGoblin, a loose sketch of documentation.

12 years agodocs: editing/tweaking deployment documentation
tycho garen [Mon, 31 Oct 2011 04:21:30 +0000 (00:21 -0400)]
docs: editing/tweaking deployment documentation

12 years agoAdded notes on a more permanent mediagoblin process.
Christopher Allan Webber [Sun, 30 Oct 2011 23:59:07 +0000 (18:59 -0500)]
Added notes on a more permanent mediagoblin process.

12 years agoMake sure we run fcgi in forked mode... mediagoblin is not currently thread safe!
Christopher Allan Webber [Sun, 30 Oct 2011 23:37:32 +0000 (18:37 -0500)]
Make sure we run fcgi in forked mode... mediagoblin is not currently thread safe!

12 years agoNo reason to include commented-out things.
Christopher Allan Webber [Sun, 30 Oct 2011 21:59:15 +0000 (16:59 -0500)]
No reason to include commented-out things.

12 years agoRecommend that users use a non-privelaged user (thanks Elrond for the text)
Christopher Allan Webber [Sun, 30 Oct 2011 21:47:39 +0000 (16:47 -0500)]
Recommend that users use a non-privelaged user (thanks Elrond for the text)

12 years agoLet's comply with the Filesystem Hierarchy Standard
Christopher Allan Webber [Sun, 30 Oct 2011 21:43:12 +0000 (16:43 -0500)]
Let's comply with the Filesystem Hierarchy Standard

... and make elrond and tychoish happy :)

12 years agoIf I"m telling people to use fastcgi, we should probably use fastcgi ;)
Christopher Allan Webber [Sun, 30 Oct 2011 21:22:35 +0000 (16:22 -0500)]
If I"m telling people to use fastcgi, we should probably use fastcgi ;)

12 years agoHook mediagoblin up to nginx
Christopher Allan Webber [Sun, 30 Oct 2011 21:07:48 +0000 (16:07 -0500)]
Hook mediagoblin up to nginx

12 years agoMore easy options for deploying without having to modify paste.ini...
Christopher Allan Webber [Sun, 30 Oct 2011 18:58:54 +0000 (13:58 -0500)]
More easy options for deploying without having to modify paste.ini...

12 years agoAdded a lot more details to deploying.rst
Christopher Allan Webber [Sun, 30 Oct 2011 16:55:41 +0000 (11:55 -0500)]
Added a lot more details to deploying.rst

12 years agoAdded a "broadcast" server config and a bit of helpful commenting (I hope!)
Christopher Allan Webber [Sun, 30 Oct 2011 16:51:40 +0000 (11:51 -0500)]
Added a "broadcast" server config and a bit of helpful commenting (I hope!)

12 years ago[620] Allow for multiple mediagoblin configs to be set in config.ini, use first
Christopher Allan Webber [Sat, 29 Oct 2011 22:04:19 +0000 (17:04 -0500)]
[620] Allow for multiple mediagoblin configs to be set in config.ini, use first

This way we can copy paste.ini into paste_local.ini but not have to
update it to find mediagoblin_local.ini.

12 years agoDefault to mediagoblin_local.ini if available in ./bin/gmg commands
Christopher Allan Webber [Sat, 29 Oct 2011 21:24:52 +0000 (16:24 -0500)]
Default to mediagoblin_local.ini if available in ./bin/gmg commands

12 years agoMerge remote branch 'remotes/elrond/misc/lazyserver_paste_local'
Jef van Schendel [Sat, 29 Oct 2011 21:13:39 +0000 (16:13 -0500)]
Merge remote branch 'remotes/elrond/misc/lazyserver_paste_local'

12 years agoSmall style changes: decrease button text size, change navigation button background...
Jef van Schendel [Sat, 29 Oct 2011 19:27:14 +0000 (14:27 -0500)]
Small style changes: decrease button text size, change navigation button background color

12 years agoRemoving this extra padding after form_field_box.
Christopher Allan Webber [Sat, 29 Oct 2011 19:13:19 +0000 (14:13 -0500)]
Removing this extra padding after form_field_box.

Maybe I'm wrong to do this, but it does seem excessive to me.

I should talk to Jef about it probably :)

12 years agoRemoving comment_form link which doesn't do anything?
Christopher Allan Webber [Sat, 29 Oct 2011 19:11:45 +0000 (14:11 -0500)]
Removing comment_form link which doesn't do anything?

12 years agoUnclosed anchor tags in the tags! Fixed :)
Christopher Allan Webber [Thu, 27 Oct 2011 18:53:32 +0000 (13:53 -0500)]
Unclosed anchor tags in the tags!  Fixed :)

12 years agoOnly show the "post a comment" link if there's a logged in user
Christopher Allan Webber [Thu, 27 Oct 2011 18:13:19 +0000 (13:13 -0500)]
Only show the "post a comment" link if there's a logged in user

12 years agoRenamed "Temporary button holder" to "actions"
Christopher Allan Webber [Thu, 27 Oct 2011 15:52:18 +0000 (10:52 -0500)]
Renamed "Temporary button holder" to "actions"

12 years agoAdded pygtk to dependencies
Joar Wandborg [Thu, 27 Oct 2011 10:14:53 +0000 (12:14 +0200)]
Added pygtk to dependencies

12 years agoAdded new thumbnailer, renamed old.
Joar Wandborg [Thu, 27 Oct 2011 00:55:12 +0000 (02:55 +0200)]
Added new thumbnailer, renamed old.

12 years agoRemoved suggestion that the user run ./bin/buildout
Christopher Allan Webber [Wed, 26 Oct 2011 16:24:39 +0000 (11:24 -0500)]
Removed suggestion that the user run ./bin/buildout

12 years agoAdded an extra warning about wipealldata being pretty inflexible.
Christopher Allan Webber [Wed, 26 Oct 2011 16:21:25 +0000 (11:21 -0500)]
Added an extra warning about wipealldata being pretty inflexible.

12 years agolazyserver.sh: Try paste_local.ini before paste.ini
Elrond [Sun, 23 Oct 2011 21:54:00 +0000 (23:54 +0200)]
lazyserver.sh: Try paste_local.ini before paste.ini

If users have a paste_local.ini, use that one instead of
the shipped paste.ini.
That way local changes will not interfere with the main
shipped config.

Also improve the help string (./lazyserver.sh -h) a bit.

12 years agoflup, not flerp!
Christopher Allan Webber [Sun, 23 Oct 2011 21:12:10 +0000 (16:12 -0500)]
flup, not flerp!

12 years agoMerge remote branch 'remotes/elrond/misc/add_db_field'
Christopher Allan Webber [Sun, 23 Oct 2011 20:38:38 +0000 (15:38 -0500)]
Merge remote branch 'remotes/elrond/misc/add_db_field'

12 years agoMerge remote branch 'remotes/elrond/refactor/gmg_cf_option'
Christopher Allan Webber [Sun, 23 Oct 2011 20:22:18 +0000 (15:22 -0500)]
Merge remote branch 'remotes/elrond/refactor/gmg_cf_option'

12 years agoAdd a flup server option to the default paste.ini to make deployment a bit easier.
Christopher Allan Webber [Sun, 23 Oct 2011 20:21:15 +0000 (15:21 -0500)]
Add a flup server option to the default paste.ini to make deployment a bit easier.

12 years agoShould be Lato-Regular.ttf not Lato-Regular.woff (why was it even working?)
Christopher Allan Webber [Sun, 23 Oct 2011 19:59:58 +0000 (14:59 -0500)]
Should be Lato-Regular.ttf not Lato-Regular.woff (why was it even working?)

12 years agoMake gmg's -cf option a global option
Elrond [Sun, 23 Oct 2011 19:33:52 +0000 (21:33 +0200)]
Make gmg's -cf option a global option

All gmg's subcommands used to have a -cf option to set the
config file. Instead make this a gmg global option.
This means:
  bin/gmg migrate -cf mediagoblin_2.ini
gets
  bin/gmg -cf mediagoblin_2.ini migrate

12 years agoRefactor gmg's cf option into a function
Elrond [Sun, 23 Oct 2011 10:47:25 +0000 (12:47 +0200)]
Refactor gmg's cf option into a function

Many (all?) gmg subcommands take a -cf option to change the
used config file. This options used to be created in each
subcommand's parse_setup. Add a helper function and use it
around.

12 years agoChange unit tests to use add_table_field
Elrond [Fri, 21 Oct 2011 22:21:25 +0000 (00:21 +0200)]
Change unit tests to use add_table_field

One of the test migrations adds a field. So rewrite it to
use the new add_table_field helper function.  This is a
good test for it.

12 years agoFactor out a add_table_field function
Elrond [Mon, 10 Oct 2011 20:08:46 +0000 (22:08 +0200)]
Factor out a add_table_field function

Migrations often just add a new field to some
table/collection. So just have a nice helper function for
this!

12 years ago591: Let Testing Middleware check for staticdirect() usage
Elrond [Mon, 3 Oct 2011 23:03:43 +0000 (01:03 +0200)]
591: Let Testing Middleware check for staticdirect() usage

All references to static, shipped content should go via
request.staticdirect().

So insert a TestingMiddleware in the chain, which tests for
this on all requests/reponses happening in the test suite.
It's a simple text search for a bogus usage pattern.

12 years agoRequire an older version of WebOb as a stopgap fix for Issue #622
Christopher Allan Webber [Tue, 18 Oct 2011 22:50:24 +0000 (17:50 -0500)]
Require an older version of WebOb as a stopgap fix for Issue #622

Hopefully they'll release a new version with my patch soon!

12 years agoNow that we're encouraging in-package virtualenv use, we should update
Christopher Allan Webber [Sat, 15 Oct 2011 22:44:22 +0000 (17:44 -0500)]
Now that we're encouraging in-package virtualenv use, we should update
.gitignore.  Done! ;)

12 years agoHotfix: Renaming cookie broke unit tests
Elrond [Sat, 15 Oct 2011 22:25:59 +0000 (00:25 +0200)]
Hotfix: Renaming cookie broke unit tests

The name of the cookie was hardcoded in the unit tests and
while renaming the cookie this part was missed.

So now read the cookie_name from the config in the test.
This also tests for the config item existing!

12 years agoSupport for older webobs and newer webobs both in accept language mess :)
Christopher Allan Webber [Sat, 15 Oct 2011 21:57:45 +0000 (16:57 -0500)]
Support for older webobs and newer webobs both in accept language mess :)

12 years agoFixes issue662, MediaGoblin was broken by recent WebOb release.
Christopher Allan Webber [Sat, 15 Oct 2011 21:46:04 +0000 (16:46 -0500)]
Fixes issue662, MediaGoblin was broken by recent WebOb release.

From WebOb release notes:

  "Accept.best_matches() is gone; use list(request.accept) or
  request.accept.best_match(..) instead (applies to all Accept-*
  headers) or similar with request.accept_language."

... seems that's what borked it...

12 years agoImage media exceptions
Joar Wandborg [Sat, 15 Oct 2011 17:16:02 +0000 (19:16 +0200)]
Image media exceptions

 - Removed exception types specified in image.processing and included them from process_media.errors instead

12 years agoMerge remote branch 'remotes/elrond/misc/i592_use_full_path'
Christopher Allan Webber [Sat, 15 Oct 2011 16:07:13 +0000 (11:07 -0500)]
Merge remote branch 'remotes/elrond/misc/i592_use_full_path'

12 years agoMerge remote branch 'remotes/elrond/idea/csrf_improvement'
Christopher Allan Webber [Sat, 15 Oct 2011 15:28:37 +0000 (10:28 -0500)]
Merge remote branch 'remotes/elrond/idea/csrf_improvement'

12 years agoMerge remote branch 'aaronw/bug601_blank_comments'
Elrond [Sat, 15 Oct 2011 12:59:52 +0000 (14:59 +0200)]
Merge remote branch 'aaronw/bug601_blank_comments'

* aaronw/bug601_blank_comments:
  Make Comment posted! translatable.
  Update english translation file.
  Added a check to prevent blank messages from being posted.

Conflicts:
mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po

12 years agoMerge remote branch 'aaronw/bug608_checkbox_labels'
Elrond [Sat, 15 Oct 2011 12:15:36 +0000 (14:15 +0200)]
Merge remote branch 'aaronw/bug608_checkbox_labels'

* aaronw/bug608_checkbox_labels:
  No need to translate label name.
  Add label tag to fix translation issue.
  Update english translation file.
  Checkbox label is being translated in the form definition -- translating it in the template is redundant and breaks <label> functionality.

Conflicts:
mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po

12 years agoImprove indentation a bit
Elrond [Sat, 15 Oct 2011 11:31:43 +0000 (13:31 +0200)]
Improve indentation a bit

Only change: Indentation, nothing else!

12 years agoMerge remote branch 'aaronw/feature469_comment_form_under_comments'
Elrond [Sat, 15 Oct 2011 11:54:58 +0000 (13:54 +0200)]
Merge remote branch 'aaronw/feature469_comment_form_under_comments'

* aaronw/feature469_comment_form_under_comments:
  Put the trans tag in the right place.
  Move comment form below comments.

12 years agoPut the trans tag in the right place.
Aaron Williamson [Fri, 14 Oct 2011 23:33:48 +0000 (19:33 -0400)]
Put the trans tag in the right place.

12 years agoSome mostly cosmetic changes to CSRF
Elrond [Mon, 3 Oct 2011 22:12:03 +0000 (00:12 +0200)]
Some mostly cosmetic changes to CSRF

* remove max_age - A session cookie is better, because it's
  a session thing, really.
* Call the cookie mediagoblin_csrftoken, much clearer.
* Use the SCRIPT_NAME for the path of the cookie, so that
  the cookie is sent back to the right place only.
  Alternatively the path= parameter could be removed, so
  that it defaults to '/'.
* call the randomness function only once, instead of twice.
  64 bits should be enough. If really more bits are needed,
  increase the number.
* Just give the number as cookie. No point in md5 and
  hexdigest in my view (those functions just make another
  representation).
* getrandbits gets a bit count directly, simpler API

12 years agoRemoved arista dependency
Joar Wandborg [Fri, 14 Oct 2011 01:18:30 +0000 (03:18 +0200)]
Removed arista dependency

12 years agoVideo transcoding is now gstreamer directly instead of through arista
Joar Wandborg [Fri, 14 Oct 2011 01:17:06 +0000 (03:17 +0200)]
Video transcoding is now gstreamer directly instead of through arista

12 years agoimport_export - Added some error handling
Joar Wandborg [Fri, 14 Oct 2011 01:15:50 +0000 (03:15 +0200)]
import_export - Added some error handling

We still want to be able to do an export if a file can't be read

12 years ago - Refractored the video thumbnailer
Joar Wandborg [Tue, 11 Oct 2011 02:57:17 +0000 (04:57 +0200)]
 - Refractored the video thumbnailer
 - Started work on video transcoder
   Not done, by far!
 - Bug fix in video.processing error handling

12 years agoOverhauls docs
Will Kahn-Greene [Thu, 6 Oct 2011 03:08:53 +0000 (23:08 -0400)]
Overhauls docs

* Removes a bunch of content that doesn't need to be in the suer manual
  anymore.
* Fixes issues so it's more readable in source form.
* Adds help chapter.
* Moves links out of paragraphs to reduce line length.
* Cleans up some language.
* Fixes some links.

12 years agoFixing 404s, related to recent util refactoring.
Christopher Allan Webber [Thu, 6 Oct 2011 01:57:02 +0000 (20:57 -0500)]
Fixing 404s, related to recent util refactoring.

12 years agoFixed incorrect logger.[...] calls
Joar Wandborg [Wed, 5 Oct 2011 22:00:09 +0000 (00:00 +0200)]
Fixed incorrect logger.[...] calls
- Added FIXME about thumb size

12 years agoAdded parameter to transcoding_error
Joar Wandborg [Wed, 5 Oct 2011 21:26:50 +0000 (23:26 +0200)]
Added parameter to transcoding_error

12 years agoMultimedia refractoring, and added video thumbnail support
Joar Wandborg [Wed, 5 Oct 2011 20:58:42 +0000 (22:58 +0200)]
Multimedia refractoring, and added video thumbnail support

12 years agoMake Comment posted! translatable.
Aaron Williamson [Tue, 4 Oct 2011 20:32:41 +0000 (16:32 -0400)]
Make Comment posted! translatable.

12 years agoNo need to translate label name.
Aaron Williamson [Tue, 4 Oct 2011 20:12:43 +0000 (16:12 -0400)]
No need to translate label name.

12 years agoAdd label tag to fix translation issue.
Aaron Williamson [Tue, 4 Oct 2011 20:11:47 +0000 (16:11 -0400)]
Add label tag to fix translation issue.

12 years agoMove comment form below comments.
Aaron Williamson [Tue, 4 Oct 2011 01:32:36 +0000 (21:32 -0400)]
Move comment form below comments.

12 years agoUpdate english translation file.
Aaron Williamson [Tue, 4 Oct 2011 01:07:16 +0000 (21:07 -0400)]
Update english translation file.

12 years agoUpdate english translation file.
Aaron Williamson [Tue, 4 Oct 2011 01:06:28 +0000 (21:06 -0400)]
Update english translation file.

12 years agoUpdate english translation file.
Aaron Williamson [Tue, 4 Oct 2011 01:05:23 +0000 (21:05 -0400)]
Update english translation file.

12 years agoAdded a check to prevent blank messages from being posted.
Aaron Williamson [Tue, 4 Oct 2011 01:03:36 +0000 (21:03 -0400)]
Added a check to prevent blank messages from being posted.

12 years agoCheckbox label is being translated in the form definition -- translating it in the...
Aaron Williamson [Tue, 4 Oct 2011 00:47:39 +0000 (20:47 -0400)]
Checkbox label is being translated in the form definition -- translating it in the template is redundant and breaks <label> functionality.

12 years agoReverse order of sanity checks: check email_verified after making sure there's a...
Aaron Williamson [Tue, 4 Oct 2011 00:28:48 +0000 (20:28 -0400)]
Reverse order of sanity checks: check email_verified after making sure there's a user in the request.

12 years agoMake sure user isn't already verified before resending verification.
Aaron Williamson [Tue, 4 Oct 2011 00:25:11 +0000 (20:25 -0400)]
Make sure user isn't already verified before resending verification.

12 years agoFixed conflict in /auth/views.py.
Aaron Williamson [Tue, 4 Oct 2011 00:01:14 +0000 (20:01 -0400)]
Fixed conflict in /auth/views.py.

12 years agoCheck request.user to determine if user is logged in.
Aaron Williamson [Mon, 3 Oct 2011 23:59:28 +0000 (19:59 -0400)]
Check request.user to determine if user is logged in.

12 years agoi592: Use full path in various places
Elrond [Mon, 3 Oct 2011 12:01:13 +0000 (14:01 +0200)]
i592: Use full path in various places

When running mediagoblin in a sub path on a web server,
most things inside mediagoblin need the "inside path", but
when generating URLs for the webbrowser, full paths are
needed.

urlgen and routes already do that.

Some (mostly pagination and login) need the URL of the
current page. They used request.path_info. But this is the
"inside" path, not the full.

So now there is request.full_path and its used in various
places.

12 years agoAdding csrf token fields to the forgot password calls
Christopher Allan Webber [Sun, 2 Oct 2011 02:31:14 +0000 (21:31 -0500)]
Adding csrf token fields to the forgot password calls

12 years agoFixing indentation in start.html
Christopher Allan Webber [Sun, 2 Oct 2011 02:30:41 +0000 (21:30 -0500)]
Fixing indentation in start.html

12 years agoMerge remote branch 'remotes/aaronw/bug444_fix_utils_py_redux'
Christopher Allan Webber [Sun, 2 Oct 2011 02:27:36 +0000 (21:27 -0500)]
Merge remote branch 'remotes/aaronw/bug444_fix_utils_py_redux'

Conflicts:
mediagoblin/util.py