Merge branch 'MDL-38943_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 18:22:59 +0000 (20:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 18:22:59 +0000 (20:22 +0200)
commitf7f8ca2420e1de284674ea1fd73c605df3113d1b
tree75a4187927091dd06a834b5db486d8ed16592947
parenta2027b873b75a16ae04b07ca35c16050e715dbfa
parent862fcc8b70ffb857f57798b3e1d7af983a0b076f
Merge branch 'MDL-38943_master' of git://github.com/dmonllao/moodle