Merge branch 'master' into rwd
authorRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Tue, 12 Nov 2013 11:57:43 +0000 (12:57 +0100)
committerRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Tue, 12 Nov 2013 11:57:43 +0000 (12:57 +0100)
commit7f0caf88dd3aac2e4d5bb4ee064137e03ecd4f03
tree969e2ccdb6f06933916d5727474bcb8e14a31e19
parent9f4f697f0c6fe9a9d55bb45aaa93c804992f3339
parent32d67bcd63571d61f090b613aba48ec4c710ae1a
Merge branch 'master' into rwd

Conflicts:
apps/wolnelektury_core/templates/superbase.html
apps/wolnelektury_core/templates/superbase.html