Skip to content
Commit c2bb6a35 authored by vforchi's avatar vforchi
Browse files

aligned with commits from Mantelet 

Merge remote-tracking branch 'upstream/master'
parents 56d6d774 1e98ff3b
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