Revision b5efffb5
| ID | b5efffb57f02d10b19fcee8f9e39c7a3165b9b71 | 
| Parent | c5ecfd3a, 7195eb6b | 
| Child | 171eba7a | 
Merge branch 'one-4.0' of git.opennebula.org:one into one-4.0
Files
- added
 - modified
 - copied
 - renamed
 - deleted
 
| ID | b5efffb57f02d10b19fcee8f9e39c7a3165b9b71 | 
| Parent | c5ecfd3a, 7195eb6b | 
| Child | 171eba7a | 
Added by Daniel Molina over 8 years ago
Merge branch 'one-4.0' of git.opennebula.org:one into one-4.0