Merge branch 'MDL-52958_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 23 Feb 2016 10:57:38 +0000 (10:57 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 23 Feb 2016 10:57:38 +0000 (10:57 +0000)
commit02038b9d79e224ad1fc769722a58088e747e298a
treef00b77bcd9c12f9a0383125c01457a5ed619d0c0
parent69d66020ce24e02273d6b49053766c8a65345767
parent44841ca9115d28c4b8aa937ebcef6fe76bdf8f89
Merge branch 'MDL-52958_master' of git://github.com/dmonllao/moodle