From: zuber <marek@stepniowski.com>
Date: Thu, 24 Sep 2009 20:04:58 +0000 (+0200)
Subject: Merge branch 'master' into view-refactor
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/d3c74552a8f8509ff85cf956cf2b750d8387b683?ds=inline;hp=d3c74552a8f8509ff85cf956cf2b750d8387b683

Merge branch 'master' into view-refactor

Conflicts:
	project/templates/explorer/editor.html
---