Merge branch 'MDL-38954_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 21:30:43 +0000 (23:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 21:30:43 +0000 (23:30 +0200)
commit8516f270c612aa3f9cb653a9f0230fac8954878f
tree5e1fe43ab0a5b4b29d9983592a321c45ef01ed0c
parent696facb159bc463c62e3a4a9cc5f4a431ffbafe1
parentc246015a5843e50ddc55031b2d884d58b6d26080
Merge branch 'MDL-38954_master' of git://github.com/dmonllao/moodle