Merge branch 'wip-MDL-32420_master' of git://github.com/lazydaisy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 22:38:43 +0000 (23:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 22:38:43 +0000 (23:38 +0100)
commite2b2794368f49f3fba2cdcdce293fc8616338791
tree7331d3ca91cb3eca20b62b21ea394d35f094f6d2
parent857b40256e747b8cfc897c0d9e7c476958c3cb3e
parent009fb7d943a9a6b5cf6b93324ece5729db8a5052
Merge branch 'wip-MDL-32420_master' of git://github.com/lazydaisy/moodle