Merge branch 'MDL-35792' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Jan 2013 21:35:06 +0000 (22:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Jan 2013 21:35:06 +0000 (22:35 +0100)
commit3cb7609bd61ea8e47447dd5f7fbe7a0f7ece0b68
tree695e72eb1f91c029b1d2d89093309a07e825ab68
parent8d21130267b8f922bf816086a52527c1e4c8da28
parent599cc731e360993672dba702740d8aef4a6109e9
Merge branch 'MDL-35792' of git://github.com/timhunt/moodle