chrisdev/pinax-theme-foundation — pull request #56 by ilendl2 (2013-02-13 15:58:05+00:00)
Title: Merge remote-tracking branch 'upstream/master'  

Merge remote-tracking branch 'upstream/master'

Conflicts:
pinax_theme_foundation/templates/account/login.html
pinax_theme_foundation/templates/account/logout.html