Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Mon, 30 Jan 2012 16:44:44 +0000 (17:44 +0100)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Mon, 30 Jan 2012 16:44:44 +0000 (17:44 +0100)
commitcb40f164b028883a2fc061307383d0aa98f8b609
treeb973cc328cb9054567b05c67d0292cd5bcfb60cb
parente353262951cc8b8d3f1a52b896a825bad743a5a7
parent01d7c5f6d52a56a9800ea7eccfeb25762261813d
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty

Conflicts:
wolnelektury/templates/catalogue/book_searched.html
apps/search/index.py