Merge branch 'MDL-38950_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 21:42:59 +0000 (23:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 21:42:59 +0000 (23:42 +0200)
commit36216331942b0a075746284bead2f39b50e4c27d
treef23d6ddf06439296def05cd02506aabfc0868c97
parent8516f270c612aa3f9cb653a9f0230fac8954878f
parent3d7848c584486c82a63040bb022f41503b9f05e8
Merge branch 'MDL-38950_master' of git://github.com/dmonllao/moodle