Merge branch 'zuber-view-refactor'
authorŁukasz Rekucki <lrekucki@gmail.com>
Mon, 28 Sep 2009 14:25:43 +0000 (16:25 +0200)
committerŁukasz Rekucki <lrekucki@gmail.com>
Mon, 28 Sep 2009 14:25:43 +0000 (16:25 +0200)
commitb348abeb083671e831f711d3d41949a9b3f3a7b4
tree6c82fd503437c500153a974ab7ca0879ea0dabc5
parentb9bce2dc718a9146a202057e4bb1809927d9caf6
parent5a1de03a12a386e83a5c579fefd8e6ffbedc2794
Merge branch 'zuber-view-refactor'

Conflicts:
apps/api/handlers/library_handlers.py
apps/api/handlers/library_handlers.py
project/static/css/master.css