Merge remote-tracking branch 'gstrat/elep' into elep
authorRadek Czajka <rczajka@rczajka.pl>
Sat, 20 Sep 2014 20:49:12 +0000 (22:49 +0200)
committerRadek Czajka <rczajka@rczajka.pl>
Sat, 20 Sep 2014 20:49:12 +0000 (22:49 +0200)
Conflicts:
cas_provider_examples/simple/urls.py


No differences found