Merge branch 'master' into funding
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Wed, 10 Apr 2013 08:00:34 +0000 (10:00 +0200)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Wed, 10 Apr 2013 08:01:17 +0000 (10:01 +0200)
commit6d7b11e4a01b2314c0527d94d91f3159c0bd34ce
tree8f1b24fc03c6cf06af38437b75cb3e3464d9715a
parentc9f85a25896062833551550a6da8d4e83cd03d39
parent02fe6525fe7fa7c16d6e1dfe0ca040ac07d41325
Merge branch 'master' into funding

Conflicts:
requirements.txt
apps/wolnelektury_core/templates/superbase.html
requirements.txt
wolnelektury/settings/__init__.py
wolnelektury/settings/basic.py
wolnelektury/settings/locale.py
wolnelektury/settings/static.py
wolnelektury/urls.py