OpenNebula

Revision 30a9162f

ID	30a9162f5edfb0b0c532a90c8f3b9b91ff4f84c1
Parent	e2f2c25e, 1122f2f2
Child	d2e781cd

Added by Ruben S. Montero over 9 years ago

Merge branch 'master' into bug-847

Conflicts:
src/um/UserPool.cc

Files

• added
• modified
• copied
• renamed
• deleted