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)
* 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.


Trivial merge