Merge branch 'MDL-39478_master' of git://github.com/dmonllao/moodle
commit5b003e9cddc41c2a46969f5b610bc16220d39f79
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 May 2013 15:52:00 +0000 (7 17:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 May 2013 15:52:00 +0000 (7 17:52 +0200)
treedbeca11b2a49324af9a1bb5370e05e211b143cac
parent49bd43c140316336bfb5d2b664e18af59096abdc
parentcfcbc34a617696dedda237e3f42e3d2b23d89fd4
Merge branch 'MDL-39478_master' of git://github.com/dmonllao/moodle