Merge remote branch 'remotes/hanaku/pagination'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 20 May 2011 03:34:57 +0000 (22:34 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 20 May 2011 03:34:57 +0000 (22:34 -0500)
commitaf4d0b5cb0de2cbc9dd78a791fd77dab3dbddaa5
tree3d5399b6d7c036c4cd78db6645eb72ed35123b39
parenta67fec8177c09c4e74ce7f4301b88f4e7ea6e658
parent3eb6fc4f2f2b0a41677ab88bdd941b79e3e87b39
Merge remote branch 'remotes/hanaku/pagination'

Conflicts:
mediagoblin/user_pages/views.py
mediagoblin/user_pages/views.py
mediagoblin/util.py