Permalink
Browse files

Merge branch 'master' into psa2

Conflicts:
	social_auth/__init__.py
  • Loading branch information...
2 parents fb29498 + 4875ab1 commit ef5aaa4ae4329528cd773848d0918d75c8069f83 @omab committed Sep 3, 2013
Showing with 0 additions and 0 deletions.

0 comments on commit ef5aaa4

Please sign in to comment.