From: Lukasz Anwajler <lukasz@anwajler.com>
Date: Fri, 27 Aug 2010 09:43:53 +0000 (-0500)
Subject: Merge branch 'master' of git@github.com:fnp/wolnelektury
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/0ee9de179914aa395f4b7475b7b9b6229c42b760?hp=0ee9de179914aa395f4b7475b7b9b6229c42b760

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
---