Merge branch 'MDL-26120_24' of https://github.com/jacks92/moodle into MOODLE_24_STABLE
commit5efc195a326a8e6ace1526b4b48cb99abea8d7ce
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 May 2013 22:55:27 +0000 (21 00:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 May 2013 22:55:27 +0000 (21 00:55 +0200)
tree4f32dfb742f0c873514589fd1b360f4f67e173d0
parentf0697b7088b80dd44d9cde4afb1208d74ee52f67
parentc2fd66ab6ec4f231be807803e139f87b5974baf5
Merge branch 'MDL-26120_24' of https://github.com/jacks92/moodle into MOODLE_24_STABLE