Merge branch 'MDL-3054' of git://github.com/nebgor/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Jan 2012 11:24:35 +0000 (12:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Jan 2012 11:24:35 +0000 (12:24 +0100)
commit325f3addf252c1acb57e61ce5cb62dd5c996cc41
tree0ceb14060976375aafe7455d81043c7072f32b64
parentb3bc81893ef057e10967fe84008d7293083ff3aa
parentb3f8559ebc0c5e7cead94782efe53219026e040e
Merge branch 'MDL-3054' of git://github.com/nebgor/moodle