Merge branch 'MDL-45580-master' of git://github.com/FMCorz/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 23 Jun 2014 07:17:45 +0000 (15:17 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 23 Jun 2014 07:17:45 +0000 (15:17 +0800)
commit2dffa24f10b1940dfe244707fc7481d0c15bdd12
tree6fab7c11d6da87602a86515065f6e3e3391e83f7
parente3c82bc974f23b3074a66011b45ec7ee4f278f30
parentb4148e46884d96b018c81a358aaf585587608454
Merge branch 'MDL-45580-master' of git://github.com/FMCorz/moodle