Merge branch 'master' of C:\Documents and Settings\elena\Proyectos\Caval\Channel Manager\channelmanager with conflicts.
Merge remote-tracking branch 'origin/master'
Solucionando bugs de NotifyHotelRates.