Merge branch 'MDL-38952_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 21:30:30 +0000 (23:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 21:30:30 +0000 (23:30 +0200)
commit696facb159bc463c62e3a4a9cc5f4a431ffbafe1
tree87cbb9ebf4f4a9ed09d4c11b44bbe489a08c58dd
parentb8968449428c02d0e5b48c175efde72b030f4976
parent1c1c28660ac183045fc47dd852e73ff0718e575e
Merge branch 'MDL-38952_master' of git://github.com/dmonllao/moodle