Merge branch 'wip-MDL-38146-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Feb 2013 22:52:20 +0000 (23:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Feb 2013 22:52:20 +0000 (23:52 +0100)
commit2a80528fd6d67dcb1574c04d2324e45f63a32abf
tree92189db3008aec3e6d909317dcc33c3c906bf1c9
parent8615b484b217d80759596905a5b025617a261b9a
parentf0b137c5b84351eef18e2fc1fe2e5a34575ea6aa
Merge branch 'wip-MDL-38146-master' of git://github.com/marinaglancy/moodle