From: Łukasz Rekucki <lrekucki@gmail.com>
Date: Mon, 5 Oct 2009 11:07:42 +0000 (+0200)
Subject: Merge branch 'master' of stigma:platforma
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/3b9b115efb44c7570453c0729f05f83a3b45cd4d?hp=--cc

Merge branch 'master' of stigma:platforma

Conflicts:
	project/static/js/button_scripts.js
---

3b9b115efb44c7570453c0729f05f83a3b45cd4d