Merge branch 'kgodey'
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Thu, 8 Jul 2010 00:34:45 +0000 (20:34 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Thu, 8 Jul 2010 00:34:45 +0000 (20:34 -0400)
commit4bf662d52cdef84ebc3eea50213f576a72b30abf
tree70182db27f3a0f35a201f2300077ab8c7d22d683
parentdb0947dc7adfb2361f01e61eb495b1638cbc446b
parentbe520c33d81631c9d649b170863c221e3169c742
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.