From: Aleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Tue, 10 Sep 2013 13:34:08 +0000 (+0200)
Subject: Merge branch 'master' into forum
X-Git-Url: https://git.mdrn.pl/edumed.git/commitdiff_plain/3ab554e979a707490d303aaa690fde92c9c643c3?hp=3ab554e979a707490d303aaa690fde92c9c643c3

Merge branch 'master' into forum

Conflicts:
	edumed/templates/home.html
---