Merge branch 'MDL-49934-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 00:39:15 +0000 (08:39 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 21 Mar 2016 00:39:15 +0000 (08:39 +0800)
commite787e681fc0369094ab0c310fe8ec3874aaa1726
tree61cde2bb5cf069094badb1e39281c8ca92004c05
parentfed66ad9e2efd3a88a42298a5d6bf71dada3ffd7
parent8e76a2fadbd1d664780f9a16b4840758018044ad
Merge branch 'MDL-49934-master' of git://github.com/jleyva/moodle