Merge branch 'MDL-49848-master' of git://github.com/xow/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 5 May 2015 02:37:53 +0000 (10:37 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 5 May 2015 02:37:53 +0000 (10:37 +0800)
commit9f3adc943bc2782a85507a593429c079d3660d60
tree8048bb78ff7417a3fca4da702435347e869d7272
parent3e5b4aa9bcec7cff05556b92b173e52480279e19
parent172ed01a29e790f088a0207525333856d24d7827
Merge branch 'MDL-49848-master' of git://github.com/xow/moodle