Merge branch 'MDL-38785_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2013 18:41:00 +0000 (20:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2013 18:41:00 +0000 (20:41 +0200)
commit80430739d912c30e56777f4965278a2e01630ba3
tree07f3d845cecbd0030d1f6e911ba3af3294491585
parenta534e06e473893a99d730c38859dcac144adb135
parent2cca40c82b0ce45a6207310f8d4782ec7c801282
Merge branch 'MDL-38785_master' of git://github.com/dmonllao/moodle