Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma
authorzuber <marek@stepniowski.com>
Tue, 20 Oct 2009 16:08:21 +0000 (18:08 +0200)
committerzuber <marek@stepniowski.com>
Tue, 20 Oct 2009 16:08:21 +0000 (18:08 +0200)
commit96bc5f73483f3e907eebd60df638a9de0a9124f3
treea8d99b0e694d1c0aae2bf35d1e6d3508fe808063
parent8c26f548ef22db734120de4a0828aa8d6b9fdaa0
parent18f305ee56846554901406ce4982aed590dac855
Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma

Conflicts:
apps/api/handlers/library_handlers.py
apps/api/handlers/library_handlers.py
apps/api/resources.py