Merge remote branch 'remotes/aaronw/bug444_fix_utils_py_redux'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 2 Oct 2011 02:27:36 +0000 (21:27 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 2 Oct 2011 02:27:36 +0000 (21:27 -0500)
commitb43b17fc2686f5524413a66f8e98f3ab0cc11a60
tree36fb9cf3155a2ff715b1e93f29be6a17cb2113e9
parente27396802caaab9a939c56d19c991339157c493f
parent91e42c467d898ef70dec2d2d34e4173ea771d2ed
Merge remote branch 'remotes/aaronw/bug444_fix_utils_py_redux'

Conflicts:
mediagoblin/util.py
mediagoblin/gmg_commands/__init__.py
mediagoblin/tools/template.py