Merge branch 'more_customizations'
authorMichele Ciccozzi <cico@lapcico.(none)>
Mon, 6 Jun 2011 13:06:45 +0000 (15:06 +0200)
committerMichele Ciccozzi <cico@lapcico.(none)>
Mon, 6 Jun 2011 13:06:45 +0000 (15:06 +0200)
commitb10406063c839f4ad856a1130c66706f004fa358
tree59969362e0f9df2e088e3cac16bc11a8ee1b6be3
parentef5ff95059866e94e89cad912c30497f90442765
parent1bf7cd1497bc0eca075bfa512831b941bfc83d25
Merge branch 'more_customizations'

Conflicts:
pagination/templates/pagination/pagination.html
pagination/templatetags/pagination_tags.py
pagination/templates/pagination/default.html
pagination/templatetags/pagination_tags.py