Merge branch 'MDL-51576-master-2' of git://github.com/ryanwyllie/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Oct 2015 08:23:31 +0000 (09:23 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 13 Oct 2015 08:23:31 +0000 (09:23 +0100)
commit08d93936f475e3d0e8b1bdabe5c8953d0d22fe3a
tree62f7d68efdbe98ea126fff01d344643931f78c61
parentab848fea815cf4b3ba1cdf1d9ee253f3299e3054
parent4b596728e7506bfe8f6a996c4364d766a2828e17
Merge branch 'MDL-51576-master-2' of git://github.com/ryanwyllie/moodle