Permalink
Browse files

Merge branch 'master' into psa2

Conflicts:
	social_auth/backends/__init__.py
	social_auth/db/base.py
	social_auth/exceptions.py
  • Loading branch information...
2 parents ef5aaa4 + abb511f commit 1f0c1da7e0027bde49b1a40bc79e0d9bfce1a605 @omab committed Sep 7, 2013
Showing with 0 additions and 0 deletions.

0 comments on commit 1f0c1da

Please sign in to comment.