Skip to content
Commit 52dfb972 authored by Emmanuel Bourg's avatar Emmanuel Bourg
Browse files

Merge tag 'upstream/1.5' 

Upstream version 1.5
parents e38d7a97 5f59d4f5
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment