Merge branch 'MDL-48685-master' of git://github.com/andrewnicols/moodle
commit215c37097e415b1c554707d0593757ccf0a4064c
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jan 2015 23:36:14 +0000 (28 00:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Jan 2015 23:36:14 +0000 (28 00:36 +0100)
tree413de457918c37fecf98533394f993fa0c2d8426
parent73bf1119ddc19181f02fac81c7d7c3def9f5e28f
parent96a546311986cf1291e2c3ef32c9aeb3085a595e
Merge branch 'MDL-48685-master' of git://github.com/andrewnicols/moodle