fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0aafa95 e0611b2)
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)
Conflicts:
apps/opds/views.py


Trivial merge