Merge branch 'MDL-38477_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Apr 2013 23:06:18 +0000 (01:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Apr 2013 23:06:18 +0000 (01:06 +0200)
commit0f8fd3a7eb5d918e477b07381173a01208a2794a
tree63dc34bf025f8c74436f4fb4fd1125bac6dc9d73
parent2bb24f16e097a16a489a8a24877916c742f76b11
parent2d9cbe88077cff4ab1201612acf15df19893d974
Merge branch 'MDL-38477_master' of git://github.com/dmonllao/moodle