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)
commitd3c74552a8f8509ff85cf956cf2b750d8387b683
tree97966077968f7fe6fb8e65a36a5d06319a050264
parent3bf45c83c84f9e7a1c5f2dafd64d812c987037e5
parente49688b94d3f0f2e72efc2b66f77a5c148aa7ea2
Merge branch 'master' into view-refactor

Conflicts:
project/templates/explorer/editor.html
project/static/js/editor.js
project/static/js/editor.ui.js
project/templates/explorer/editor.html