Merge branch 'master' of https://github.com/fnp/wolnelektury
authorMarcin Koziej <marcin@lolownia.org>
Tue, 17 Jul 2012 09:38:10 +0000 (11:38 +0200)
committerMarcin Koziej <marcin@lolownia.org>
Tue, 17 Jul 2012 09:38:10 +0000 (11:38 +0200)
commit55416847d9b5329ebbacbf44ebfadf5a92332764
treee3988264701ed68c768eac229518d2d6654aea95
parent0aafa951948f151fb74c704d7901d9bbc136ac74
parente0611b29453531f662d873890d5ab44b340a8856
Merge branch 'master' of https://github.com/fnp/wolnelektury

Conflicts:
apps/opds/views.py