Merge branch 'master' into sunburnt
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Mon, 3 Sep 2012 14:55:43 +0000 (16:55 +0200)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Mon, 3 Sep 2012 14:55:43 +0000 (16:55 +0200)
commitddaff853c515ef7d188523d9ef17d271901dd581
treed8d007a1b477942dff0cf97a9b3cd88482f87952
parentfa9ab52217a8e6912fa4677fc7bb1da21044b470
parent0c1644b480a81a3b1d55efcd4fc328f7f7ed77a6
Merge branch 'master' into sunburnt

Conflicts:
apps/catalogue/management/commands/importbooks.py
apps/catalogue/models/book.py
apps/catalogue/management/commands/importbooks.py
apps/catalogue/models/book.py
apps/catalogue/tasks.py
requirements.txt