Merge proposals dependent on lp:~jo0thlt/sfsoluciones/christmas

lp:~jo0thlt/sfsoluciones/christmas has no merge proposals.