Commit a9fd1da5 by Renzo Lucioni

Merge branch 'release' into release-2015-08-18-conflict

parents 2f5193cf 5f5daa26
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