Merge branch 'wip-MDL-36819-m24-rb' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Nov 2012 01:29:58 +0000 (02:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Nov 2012 01:29:58 +0000 (02:29 +0100)
commit155bd5d54a03d14df1b8ea769ef91cf5f4ad3022
tree015e5c8b6b98415deb8a01443205e3b5d42a9d01
parentf725158ea6398af77984fdae68f137b6df189869
parent2b274ad00102140aa5a021160ea1ea9b919a11f2
Merge branch 'wip-MDL-36819-m24-rb' of git://github.com/samhemelryk/moodle