Commit f84243d8 by Renzo Lucioni

Merge pull request #9388 from edx/release-2015-08-18-conflict

Release 2015 08 18 conflict
parents 2f5193cf a9fd1da5
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