From: Łukasz Rekucki <lrekucki@gmail.com>
Date: Mon, 24 Aug 2009 15:59:05 +0000 (+0200)
Subject: Merge branch 'master' of git@stigma:platforma
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/b157bbf02932396c65c0aca9638c96200c4665df?hp=b157bbf02932396c65c0aca9638c96200c4665df

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
---