Merge branch 'MDL-37961-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Feb 2013 23:43:38 +0000 (00:43 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Feb 2013 23:43:38 +0000 (00:43 +0100)
commit65412c365d351421db463738a0eb8b1c7bf7d623
tree9dc72d2103e6eefeb6e83f432297a638fb3527ca
parente196517bf52cbeb67ace8b7dfeb6d1994fff34ca
parent4d3fd60d28b9f76d73f54083e144139093bdfcab
Merge branch 'MDL-37961-master' of git://github.com/FMCorz/moodle