Commit 746e52a6 authored by Marius Cramer's avatar Marius Cramer

Included changes from stable that could not be merged

parent fecff908
Markdown is supported
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