Merge branch 'MDL-50947_master' of git://github.com/moodlerooms/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 12 Aug 2015 00:30:03 +0000 (08:30 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 12 Aug 2015 00:30:03 +0000 (08:30 +0800)
commit3718d2cd170e52d2543dfa02e66f32787d75d832
tree65dadf76f8c6f1443e96d0afae59b18618fec343
parentfb41850a3c6dca89783c1786f6ab3a144248066d
parent5222ab7f4b9c51a46ee1869f5a40176d3b354a8b
Merge branch 'MDL-50947_master' of git://github.com/moodlerooms/moodle