Merge branch 'MDL-49211_M28' of git://github.com/lazydaisy/moodle into MOODLE_28_STABLE
commit7001bf9a8c05cf6d270556359768b822232a55ed
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 23:03:59 +0000 (18 00:03 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 23:03:59 +0000 (18 00:03 +0100)
tree495d8300a88fa114b39607c00620c10cc42f8e33
parent7f8ae8f54ef8af34193df872f50bed41346afefb
parent27a5f957ba9a8fe13d85ed2e0b271283da2bf374
Merge branch 'MDL-49211_M28' of git://github.com/lazydaisy/moodle into MOODLE_28_STABLE