Merge proposals dependent on lp:~yannick-vaucher/thermopi/model

lp:~yannick-vaucher/thermopi/model has no merge proposals.