am efdbf044: merge from open-source master
Merge commit 'efdbf044b89fad22a1792debb09388d2a7d95a66' * commit 'efdbf044b89fad22a1792debb09388d2a7d95a66': eclair snapshot
This commit is contained in:
commit
1acde9b749
Merge commit 'efdbf044b89fad22a1792debb09388d2a7d95a66' * commit 'efdbf044b89fad22a1792debb09388d2a7d95a66': eclair snapshot