Skip to content

Commit

Permalink
Merge branch 'sirish' of https://git.hcleai.com/keystone into sirish
Browse files Browse the repository at this point in the history 
Conflicts:
	keystone/auth_server.py
  • Loading branch information
@juvvadi
juvvadi committed May 9, 2011
2 parents cbdc5c1 + db0df82 commit 400ad67
Show file tree
Hide file tree
Showing 6 changed files with 901 additions and 1,077 deletions.
Loading

0 comments on commit 400ad67

Please sign in to comment.