Merge branch 'MDL-47797' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 31 Oct 2014 16:48:30 +0000 (16:48 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 31 Oct 2014 16:48:30 +0000 (16:48 +0000)
commit1de9b5072aa80567a7caa58f8889dfc9cc555044
tree5bffce368ef7828f5ff156ebf8415a821da70ade
parentb4eaafd74427489f7019fb22094abd2729034d1e
parent234c5337f7b562465568458422a5de5a7146e8b7
Merge branch 'MDL-47797' of git://github.com/timhunt/moodle