From: Radek Czajka <radekczajka@nowoczesnapolska.org.pl>
Date: Fri, 31 Jan 2014 14:51:59 +0000 (+0100)
Subject: Merge branch 'leveling'
X-Git-Url: https://git.mdrn.pl/edumed.git/commitdiff_plain/118fd7ac41a586001b4c8f45c149731cc9a2e586?hp=118fd7ac41a586001b4c8f45c149731cc9a2e586

Merge branch 'leveling'

Conflicts:
	edumed/settings.d/30-apps.py
---