Merge branch 'MDL-33306' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2012 22:30:35 +0000 (00:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2012 22:30:35 +0000 (00:30 +0200)
commita39c97ca4a9a5f1bec7e77fa74cef3262eb601c2
tree62cff414885c8f0a048f8b56744f3aefe5caded9
parentedeb39d44af84669813eee73b71a6aa94b548c71
parent89269fc2c82cc50c9deca7bdeb832305a4e96e7b
Merge branch 'MDL-33306' of git://github.com/timhunt/moodle