Merge branch 'MDL-51075_29' of git://github.com/dmonllao/moodle into MOODLE_29_STABLE
commit998110817090c79be50c0b63cdef93313bae2227
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 21:45:10 +0000 (8 22:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Feb 2016 21:45:10 +0000 (8 22:45 +0100)
treee80c2cef19e34ad299d2144f4bdb89478bdbf944
parentd0991e9f025ea080139f184e5abd40556983e29c
parenta84dfd422a877dd9772f28f90ad89b118ed6eba8
Merge branch 'MDL-51075_29' of git://github.com/dmonllao/moodle into MOODLE_29_STABLE