Merge branch 'MDL-43743_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jan 2014 23:05:03 +0000 (00:05 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jan 2014 23:05:03 +0000 (00:05 +0100)
commit9faed21cb9709baedfde83af089fb9f239b34893
treeca2172eb77735be82b75ceb57eb521970954c8d0
parent221e6adaa55bd5949774cc70f8d3e0e17d170ea0
parenta77adc602ae4f87c714750a12c9f6eca636d486e
Merge branch 'MDL-43743_master' of git://github.com/dmonllao/moodle