merge
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Thu, 26 Jan 2012 13:17:43 +0000 (14:17 +0100)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Thu, 26 Jan 2012 13:17:43 +0000 (14:17 +0100)
commit71209be8f9c399340bddb819f71e99ecf116187b
treebd4c2960dc9abe3eda6e143d510d24ace8dce1b4
parent4cf27ad4ae5ac3610e857379b2a788582580aa5b
parentf2056dbaafa8f6a5bf72ef25ecf77060693ba35d
merge
apps/catalogue/views.py
apps/search/templatetags/search_tags.py