Merge branch 'MDL-49333-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 08:23:17 +0000 (16:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 08:23:17 +0000 (16:23 +0800)
commit88019507b7cdb8b602b7fbf3621d9ea851977269
treef52646068450f3ff74be201e7b56f353d550e69a
parenta0941ad0afd0f842de16d105ba503654d60eeefa
parent14ae63be25c0ad9fcad8a3239ae5f3f4fec1c05e
Merge branch 'MDL-49333-master' of git://github.com/jleyva/moodle