Ruben S. Montero 2e06f4f26d Merge branch 'feature-189' ...

Conflicts:
	include/VirtualMachine.h
	include/VirtualMachinePool.h
	include/VirtualNetwork.h
	share/etc/oned.conf
	src/scheduler/src/xml/expr_arith.cc
	src/scheduler/src/xml/expr_arith.h
	src/scheduler/src/xml/expr_bool.cc
	src/scheduler/src/xml/expr_bool.h
	src/scheduler/src/xml/expr_parser.c
	src/template/template_parser.c
	src/template/template_syntax.cc
	src/template/template_syntax.h
	src/vm/VirtualMachine.cc
	src/vm/VirtualMachinePool.cc
	src/vm/vm_var_parser.c
	src/vm/vm_var_syntax.cc
	src/vm/vm_var_syntax.h

2010-06-25 14:34:44 +02:00

..

defaultrc

Changed copyright notice

2010-02-22 18:00:30 +01:00

oned.conf

Merge branch 'feature-189'

2010-06-25 14:34:44 +02:00