Merge branch 'MDL-54994' of git://github.com/stronk7/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 13:18:15 +0000 (14:18 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 13:18:15 +0000 (14:18 +0100)
commit98ebfabc13460ac636eac76b6f3e953b39383dd2
treee36ecfbb34232d5881bca10d058818f4d7d777c4
parent970fcc44e61b40b0206d0062b6055b9cbec343e8
parenta763bb05536243213afebc5c493abe7e23d2a4c4
Merge branch 'MDL-54994' of git://github.com/stronk7/moodle