Merge branch 'MDL-42627_master' of git://github.com/dmonllao/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 08:15:53 +0000 (16:15 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 3 Dec 2013 08:15:53 +0000 (16:15 +0800)
commit23a05a1b9a88820db4e1f581af0a0d348a0a7390
treef48b136a273af45a6c2ef0dbf0bdba00700154e3
parenta5ec4f7ae9c8dc420d642f62e57cda871705b065
parente7c71c448b7c0fb56551e4876559cc50e181e517
Merge branch 'MDL-42627_master' of git://github.com/dmonllao/moodle