Merge branch 'MDL-39686_master' of git://github.com/dmonllao/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 27 May 2013 08:29:00 +0000 (16:29 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 27 May 2013 08:29:00 +0000 (16:29 +0800)
commite6302a3c759c95edf0a2452a1aa114f5d9359d99
tree9f21558090807477ae30e8b34c2f42bb22d90e1b
parent1833a3c4494b037050252c97ded3de0296fd5948
parent41eb672ba442bfd10dd691b3300c73db7bdb8232
Merge branch 'MDL-39686_master' of git://github.com/dmonllao/moodle