Skip to content
Commit 73d32ce2 authored by David Sterba's avatar David Sterba
Browse files

Merge branch 'misc-4.7' into for-chris-4.7-20160516

parents 02da2d72 4673272f
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