Merge branch 'MDL-40255_master' of git://github.com/lazydaisy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Jun 2013 17:25:53 +0000 (19:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Jun 2013 17:25:53 +0000 (19:25 +0200)
commitb662b8576d86d5c41d95cfcc7582d6de6a606731
treea097d07cec15f277cadd1ab3165843170561dbfd
parent75413055d0a62ad68e6eab762ef45f3be1cf2c41
parent7f773d0bcd0f7150fa57f8083504925e825d5818
Merge branch 'MDL-40255_master' of git://github.com/lazydaisy/moodle