Merge branch 'MDL-37418_master' of git://github.com/ds125v/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Mar 2014 20:37:26 +0000 (21:37 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 25 Mar 2014 20:37:26 +0000 (21:37 +0100)
commit767a5a08d940144c6f00a06178df1bc1b43712fd
treea25d2aacd808b9d24946929cec38e2a825dd3846
parentc56e0192ef75fdb68ec98400e44a2a7b7415f0dd
parente06005b604348bf943d946d20ae9da63ab556c9f
Merge branch 'MDL-37418_master' of git://github.com/ds125v/moodle