Merge branch 'MDL-54976-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 13:51:59 +0000 (14:51 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 13:51:59 +0000 (14:51 +0100)
commit1f0daa292e9fe4445d369910f62416cee403fd9d
treea965813f649169d01f5503231c9e58687f19a806
parent98ebfabc13460ac636eac76b6f3e953b39383dd2
parent9f83ce7e0c96cd0b51db86ddffc9537750b42989
Merge branch 'MDL-54976-master' of git://github.com/junpataleta/moodle