From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Mon, 22 Jul 2013 11:34:51 +0000 (+0200)
Subject: Merge branch 'master' into ofop
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/9c90640199aa690235670f01d842e11386ded0ac?hp=9c90640199aa690235670f01d842e11386ded0ac

Merge branch 'master' into ofop

Conflicts:
	apps/toolbar/fixtures/initial_toolbar.yaml
	redakcja/static/xsl/wl2html_client.xsl
---