Merge branch 'MDL-39012_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 17:55:29 +0000 (19:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 17:55:29 +0000 (19:55 +0200)
commit26b7bea2c05ad452275c49c602b843442f3862e4
treec8d8be02b2048a7c3f78e53be630564726415dc6
parent275c2c9f8a3abea85e17bc8f1a2900b557ab4ddf
parent0875eeef4f493b207130d12499059f284cab24af
Merge branch 'MDL-39012_master' of git://github.com/dmonllao/moodle