diff options
| author | Todd Willey <todd@rubidine.com> | 2010-07-14 23:46:23 -0400 |
|---|---|---|
| committer | Todd Willey <todd@rubidine.com> | 2010-07-14 23:46:23 -0400 |
| commit | 69bb10a9f3258be06e34dbb2b051ed2bdd31c1d7 (patch) | |
| tree | dd9339d9f1ea371b5e5722112120c9f4cf729f21 /plugins | |
| parent | 702391e5d3f3cee5fe1d5e34d175f0fe0b5d0d7a (diff) | |
| parent | 1624e2aa51d6a77fbcbbf75f756aa88d27d1c474 (diff) | |
Merge branch 'master' into vpnredis
Conflicts:
nova/auth/users.py
Diffstat (limited to 'plugins')
0 files changed, 0 insertions, 0 deletions