Merge branch 'MDL-38337' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Mar 2013 23:25:05 +0000 (00:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Mar 2013 23:25:05 +0000 (00:25 +0100)
commitbf3a44afbe38d164fd46309768e873e09ce90cc3
treee6057cc7d6c00cd661fa3c02f9a414034574df30
parentab7cb04fb842ad2c9c0575761ec5fb265f359c23
parentf9e5471273ec09300674c794e10e7cb1a12df77e
Merge branch 'MDL-38337' of git://github.com/timhunt/moodle