Merge branch 'master' into view-refactor
authorzuber <marek@stepniowski.com>
Thu, 24 Sep 2009 20:04:58 +0000 (22:04 +0200)
committerzuber <marek@stepniowski.com>
Thu, 24 Sep 2009 20:04:58 +0000 (22:04 +0200)
Conflicts:
project/templates/explorer/editor.html


No differences found