Merge branch 'MDL-38439_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Apr 2013 23:04:31 +0000 (01:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Apr 2013 23:04:31 +0000 (01:04 +0200)
commitc1bccc8ef53839f1611076aee7dcfec58e28399f
treef29dd932de3b7f23086695857c54082fcb2c1f0c
parent9f0700fb6caae3b72a6b98a3de24d674beb0d1ad
parent9449cf8e11b01ffed5e3571fc46573521f067282
Merge branch 'MDL-38439_master' of git://github.com/dmonllao/moodle