Merge branch 'MDL-43802_master' of git://github.com/dmonllao/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 18 Feb 2014 06:01:33 +0000 (14:01 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 18 Feb 2014 06:01:33 +0000 (14:01 +0800)
commit60c85b8596c24932526cf8ab6f3af14e2dcbe2b2
tree0b37824c5ce365ef74e83b02fbe063e56d3b9f56
parentb41ea78c3956840c126265e156893e5166f002b7
parentfbd904ef411bdaede14844e41a1daa286efa0950
Merge branch 'MDL-43802_master' of git://github.com/dmonllao/moodle