Merge branch 'MDL-40533-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jan 2014 23:17:31 +0000 (00:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jan 2014 23:17:31 +0000 (00:17 +0100)
commit1816a46d1112339febfd0ca10ad90315943d2627
tree7cdcc501d1a08ce1283914f311457d87439b0e2a
parent9faed21cb9709baedfde83af089fb9f239b34893
parentf15aff3802534352883af93b97c0a3d2980bcf1c
Merge branch 'MDL-40533-master' of git://github.com/FMCorz/moodle