pinax/pinax-theme-bootstrap — pull request #18 by dstufft (2012-01-21 19:01:22+00:00)
Title: switch to using the static templatetag

Conflicts:

pinax_theme_bootstrap/templates/theme_base.html