From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Thu, 8 Jul 2010 00:34:45 +0000 (-0400)
Subject: Merge branch 'kgodey'
X-Git-Tag: philo-0.9~53
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/4bf662d52cdef84ebc3eea50213f576a72b30abf

Merge branch 'kgodey'

* kgodey:
  Fixing a double declaration of the monthname filter, and renaming ap_monthname to apmonthname (matches apnumber from django.contrib.humanize).
  Added templatetags "monthname" and "ap_monthname" to Penfield, which turn month numbers into month names.
---

4bf662d52cdef84ebc3eea50213f576a72b30abf