Merge branch 'MDL-48215_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 05:23:30 +0000 (13:23 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 17 Feb 2015 05:23:30 +0000 (13:23 +0800)
commita50840db340557140e06cc52af3bf121d81584e8
tree39eba3517dde532895c8796edbf39082d3fc1ac0
parent77b0238bdbb42aa72a2a46b842a55948fc00499c
parent3a1cc9475d0a7fcc8ab4272d7edf4769afe7fa6f
Merge branch 'MDL-48215_master' of git://github.com/markn86/moodle