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)
commit288b97cb037b17ccab0c9c11ec987ad124e350d1
treeefe0f2d5ffebbdeb9bc703bf153c50756eb5b416
parent18abc4fde3d7a7d9195dfc43239e482d2a4671ce
parentef87a0cbe5fa23dd273df9c1360037507b48fc4e
Merge remote-tracking branch 'gstrat/elep' into elep

Conflicts:
cas_provider_examples/simple/urls.py
cas_provider/views.py