am a7f8f312: merge from open-source master
Merge commit 'a7f8f312e0791509b2382f90861fe9f373bd4f0b' * commit 'a7f8f312e0791509b2382f90861fe9f373bd4f0b': eclair snapshot
This commit is contained in:
commit
0493b61c1a
Merge commit 'a7f8f312e0791509b2382f90861fe9f373bd4f0b' * commit 'a7f8f312e0791509b2382f90861fe9f373bd4f0b': eclair snapshot