Checar cambios en gitignore
Merge branch 'webservice' of github.com:dravix/tpc into webservice
Merge branch 'webservice' of github.com:dravix/tpc into webservice
Merge branch 'master' of github.com:dravix/tpc into webservice
Actualizacion 2014-09-23
Actualizacion 2 20140923
Merge branch 'mhernandez'
Merge branch 'master' of github.com:dravix/tpc

Conflicts:
	protected/controllers/DistribucionesController.php