Merge branch 'MDL-45686' of git://github.com/jmvedrine/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 25 May 2014 22:55:11 +0000 (10:55 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 25 May 2014 22:55:11 +0000 (10:55 +1200)
commit837ab70b85f27c460e16d1f39aa97abcdcc2d56b
tree13a6668a5ca8f4316f3948c8efce18ec7400f7e6
parent3b31276bc8ebed7a1683e1decbadd808f0041cae
parent8974442b72111ca406940bad5527239b860e8097
Merge branch 'MDL-45686' of git://github.com/jmvedrine/moodle