Merge branch 'MDL-39143-master' of git://github.com/barbararamiro/moodle
commit3b8841dda2a100f6a85b7a713e45f87d29ad36a8
authorDamyon Wiese <damyon@moodle.com>
Mon, 6 May 2013 07:31:05 +0000 (6 15:31 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 6 May 2013 07:31:05 +0000 (6 15:31 +0800)
tree77c616cbc15228f1a3f65cd54f71fe67f537e820
parent4017ea2fce7a600ab433756f45b811de997a5c68
parenta129cc06e8bbf84737b079d0135915ac0714f1cb
Merge branch 'MDL-39143-master' of git://github.com/barbararamiro/moodle