Merge branch 'MDL-42816-master' of https://github.com/StudiUM/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Apr 2014 23:52:41 +0000 (01:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Apr 2014 23:52:41 +0000 (01:52 +0200)
commit57c92af7ad7f77306dd5338005932faf2801c56c
tree4892f1afbcc2f77a12748610ec305ad0ac5d1241
parent929e32489ffa2f2885387f82f2c632e6db9000ee
parent2d35b7d3d8388d71b80694fd53aa3631411f434c
Merge branch 'MDL-42816-master' of https://github.com/StudiUM/moodle