Merge remote branch 'remotes/elrond/idea/shortcuts'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 5 Jun 2011 20:36:51 +0000 (15:36 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sun, 5 Jun 2011 20:36:51 +0000 (15:36 -0500)
1  2 
mediagoblin/util.py

Simple merge