Merge branch 'MDL-55084' of git://github.com/prg3/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 11 Jul 2016 13:06:38 +0000 (15:06 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 11 Jul 2016 13:06:38 +0000 (15:06 +0200)
commit34127afdb6226daf35c05ac2ef2d10426e498cfa
treefd4a9ae48d9d2fa2d1c590b364c40013bc091e4b
parent7d650df727d924c1507ecff22ba1361ac9ba7a25
parentc248c3f07fdea8a042f25f6bb0bdc8c18892a70c
Merge branch 'MDL-55084' of git://github.com/prg3/moodle