From: Radek Czajka <rczajka@rczajka.pl>
Date: Sat, 20 Sep 2014 20:49:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'gstrat/elep' into elep
X-Git-Tag: 22.4~10^2~5
X-Git-Url: https://git.mdrn.pl/django-cas-provider.git/commitdiff_plain/288b97cb037b17ccab0c9c11ec987ad124e350d1?ds=sidebyside;hp=288b97cb037b17ccab0c9c11ec987ad124e350d1

Merge remote-tracking branch 'gstrat/elep' into elep

Conflicts:
	cas_provider_examples/simple/urls.py
---