Merge branch 'MDL-48342' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Dec 2014 16:31:15 +0000 (16:31 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 4 Dec 2014 11:37:52 +0000 (11:37 +0000)
commit67a51a5bed57e6f400df6a0869dbcd0733e0a503
treeb47fa3e387a2de026be9db7073b8785ba1b4d297
parentf9fae517043dc2c46bfef58d2b67fe345f4d23ce
parent762ee1393b2c7db24f5fd2ea1f3a8e66a1524cb7
Merge branch 'MDL-48342' of git://github.com/jmvedrine/moodle