los mantenedores
aaaaaaaaaa
Merge remote-tracking branch 'origin/saabCesar'

Conflicts:
	protected/controllers/AreaController.php
	protected/controllers/MetaController.php
	protected/controllers/PersonalController.php
	protected/views/bien/index.php
	protected/views/personal/_search.php
	protected/views/personal/admin.php
	protected/views/personal/index.php
	protected/views/proveedor/_search.php
	protected/views/proveedor/admin.php
	protected/views/usuario/admin.php
Merge branch 'saabCarlos'

Conflicts:
	protected/config/main.php
	protected/controllers/PersonalController.php
	protected/views/personal/_form.php
	protected/views/personal/admin.php
	protected/views/personal/create.php
arreglo
arreglos
arreglo
arreglo
arreglo
arreglo
arreglos
actualizaciones