Merge branch 'master' of git@github.com:fnp/wolnelektury
authorLukasz Anwajler <lukasz@anwajler.com>
Fri, 27 Aug 2010 09:43:53 +0000 (04:43 -0500)
committerLukasz Anwajler <lukasz@anwajler.com>
Fri, 27 Aug 2010 09:43:53 +0000 (04:43 -0500)
commit0ee9de179914aa395f4b7475b7b9b6229c42b760
treec266f2387ba24fa6b532e23fb2366f27183b6c2f
parent8e2e65fd5f86516e7d15df0c1106a0b861bfb011
parent2d43412d612356fe03486ea67a5364833e1baea8
Merge branch 'master' of git@github.com:fnp/wolnelektury

Conflicts:

apps/catalogue/locale/pl/LC_MESSAGES/django.po
apps/catalogue/locale/uk/LC_MESSAGES/django.mo
apps/catalogue/locale/uk/LC_MESSAGES/django.po
wolnelektury/locale/pl/LC_MESSAGES/django.mo
wolnelektury/locale/pl/LC_MESSAGES/django.po
wolnelektury/locale/uk/LC_MESSAGES/django.mo
wolnelektury/locale/uk/LC_MESSAGES/django.po
apps/catalogue/locale/uk/LC_MESSAGES/django.mo
apps/catalogue/locale/uk/LC_MESSAGES/django.po
wolnelektury/locale/pl/LC_MESSAGES/django.mo
wolnelektury/locale/pl/LC_MESSAGES/django.po
wolnelektury/locale/uk/LC_MESSAGES/django.mo
wolnelektury/locale/uk/LC_MESSAGES/django.po
wolnelektury/static/js/catalogue.js