Merge branch 'MDL-37555' of git://github.com/stronk7/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jan 2013 19:52:47 +0000 (20:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jan 2013 19:52:47 +0000 (20:52 +0100)
commit937ad8c62628321b3cb69782fcf88993ed49db82
treec34c89a4a22b336c03691c5591bf9f261c68cd64
parent67cc80197f0c18a8e2ad0f79f3ad885249b12ee6
parentc6523d2f943bc4e72f4486f299d358bd110cabd9
Merge branch 'MDL-37555' of git://github.com/stronk7/moodle