Merge branch 'MDL-35027-B' of https://github.com/bostelm/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Aug 2015 23:15:59 +0000 (01:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Aug 2015 23:15:59 +0000 (01:15 +0200)
commitcaf6577e7f7b9c695553aaa9a3307b1177ca9bba
tree51e4fd2e13f2dc82c92061fc55a652246470183a
parent6573ba3e279fe8e3fff87e069807498076e2276e
parente143918f9e7f0fc568de81a5492ab5f087c6917a
Merge branch 'MDL-35027-B' of https://github.com/bostelm/moodle