Merge branch 'MDL-41761-master' of git://github.com/jamiepratt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Oct 2013 23:29:17 +0000 (01:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Oct 2013 23:29:17 +0000 (01:29 +0200)
commit8fe9bbde098f07cce9dd37e30bdd28588136bec6
treed0a205ea97f05d6972c6f6476e08bf244f2a510a
parent38c6dc4313e392130fc9b9d8c1a479803d00b9ce
parent6dd9362e84e044a6578b120edd04897cc7fbc1f1
Merge branch 'MDL-41761-master' of git://github.com/jamiepratt/moodle