1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-24 02:03:52 +03:00
Ruben S. Montero 7686ca93e0 Merge branch 'master' into vdc-federation
Conflicts:
	include/GroupPool.h
	include/UserPool.h
2014-01-23 16:36:22 +01:00
..
2014-01-09 11:51:20 +01:00