Merge branch 'master' of git@stigma:platforma
authorŁukasz Rekucki <lrekucki@gmail.com>
Tue, 25 Aug 2009 14:22:54 +0000 (16:22 +0200)
committerŁukasz Rekucki <lrekucki@gmail.com>
Tue, 25 Aug 2009 14:22:54 +0000 (16:22 +0200)
commit1fc8724242d7f5bbba51812a118d86aead57f32b
tree3f30cea757e524843bc188db3d286285779b67a0
parent05944499fb4b71d18a470ba9cf33805f2d10e416
parenta130412e611a2a29bf0cc9bbbfdefea0b1d0061f
Merge branch 'master' of git@stigma:platforma

Conflicts:

project/static/js/jquery.logging.js
apps/explorer/views.py
project/static/css/master.css
project/templates/base.html
project/templates/explorer/file_xml.html