Permalink
Browse files

Merge branch 'master' into psa2

Conflicts:
	social_auth/__init__.py
  • Loading branch information...
2 parents 0cf3daf + 81c6920 commit 24d96e9b2be24e4f0a28225b0ff53e9ee6024730 @omab committed Aug 30, 2013
Showing with 0 additions and 0 deletions.

0 comments on commit 24d96e9

Please sign in to comment.