Merge branch 'master' of git@stigma:platforma
authorŁukasz Rekucki <lrekucki@gmail.com>
Mon, 24 Aug 2009 15:59:05 +0000 (17:59 +0200)
committerŁukasz Rekucki <lrekucki@gmail.com>
Mon, 24 Aug 2009 15:59:05 +0000 (17:59 +0200)
commitb157bbf02932396c65c0aca9638c96200c4665df
treecfbeb44f0fc3954af87d69d4d32359c9da097510
parentc7917ce18f0f62eac89e1eb4b6ae6d8c48133600
parent626e9c46c2cf49a63b887c8b8f800bf55f9d7ae9
Merge branch 'master' of git@stigma:platforma

Conflicts:

project/static/js/jquery.hpanel.js
project/static/js/panels.js
project/templates/explorer/panels/xmleditor.html
project/static/js/jquery.hpanel.js
project/static/js/panels.js