Merge branch 'MDL-35669-master-2' of git://github.com/micaherne/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Oct 2012 21:44:07 +0000 (23:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Oct 2012 21:44:07 +0000 (23:44 +0200)
commit1203b6ea052d96941f18abd55d36642efa96d51c
treec8727b039aa3d1988b0ba3bdadc4473eb44e0385
parentcf452060062556960a81c235a94ac270f52c15d6
parentf127b1a53866f87833b2abf287564fa520a9bfc0
Merge branch 'MDL-35669-master-2' of git://github.com/micaherne/moodle