Skip to content
Commit 194e007e authored by Mislav Marohnić's avatar Mislav Marohnić
Browse files

Merge branch 'yosemite' 

Fixes #651, fixes #648
parents 87d7e109 84d61e86
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