Merge branch 'MDL-47664-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Oct 2014 16:49:02 +0000 (17:49 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Oct 2014 16:49:02 +0000 (17:49 +0100)
commitcf3fbf8a0eb14e3c647a7a03e1d4e8745d9b1940
tree085fa2a066aedad9e31e2b497edb6e747ff03b96
parent6c75bcb5d694e3ee87958dd64148e0272b320e8f
parent3fa0daa90f3b872cba807ddb8a94d9adeb65689f
Merge branch 'MDL-47664-master' of git://github.com/andrewnicols/moodle