into xiphis.org:/anubis/antony/work/p2-bug25679.3.merge-5.1 storage/federated/ha_federated.cc: Auto merged
Attach a file by drag & drop or click to upload
