Merge branch 'wip-MDL-39764_M24_3' of git://github.com/gjb2048/moodle into MOODLE_24_...
commitb4a8c66cca1ca687a04d60bd7a5a5e9743296e0d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Jun 2013 23:44:11 +0000 (4 01:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Jun 2013 23:44:11 +0000 (4 01:44 +0200)
tree0fc367eaca644e6f356da07603936d7dee52ae01
parentd4ef1bbbcf6949aacddedb168cd93ae7567de0f8
parentb0997b27fcd57cbbbb9c7957c32c8d4281b858c8
Merge branch 'wip-MDL-39764_M24_3' of git://github.com/gjb2048/moodle into MOODLE_24_STABLE