Merge branch 'MDL-49351-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 07:21:13 +0000 (15:21 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 Mar 2015 07:21:13 +0000 (15:21 +0800)
commit8ee9d93e314523f001a26b1cedee8272c5159c91
treed787196be836cb2fb99b224349add6b3cf2670ad
parent2af068596aa778a5baefd82e3ec15981859a0c63
parentc73b8d85c5307c6b382086da4cddf39151b8548e
Merge branch 'MDL-49351-master' of git://github.com/jleyva/moodle