Merge branch 'MDL-38814_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2013 01:30:30 +0000 (03:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2013 01:30:30 +0000 (03:30 +0200)
commita5efbe6161b219f6b832a1f8e2df3745ecfb7845
treead3a2ca0300c45e40bea82e5b36fc257969178a7
parent51cae5899874cd500ff84a908c322e96668b3508
parent5bc64b0fab594625f06d9d0672936ebbafd50385
Merge branch 'MDL-38814_master' of git://github.com/dmonllao/moodle