Merge branch 'MDL-37577' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Jan 2013 19:01:39 +0000 (20:01 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Jan 2013 19:01:39 +0000 (20:01 +0100)
commitea4edbd6bcf376ce2e9aa295c656b5695ee1e27e
tree48493e14285aaa920609762163202e5c857150d9
parent6ee4df92abb50af51614743ca6772c4d9a2ea605
parent805e32f74ebfa926d2a096419f87c66dff27e256
Merge branch 'MDL-37577' of git://github.com/timhunt/moodle