Merge branch 'MDL-35153-master' of https://github.com/mackensen/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2012 23:59:28 +0000 (01:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2012 23:59:28 +0000 (01:59 +0200)
commit6dc9b1569d46a52357337c5d8b1a5816e270f51c
treec10b7271a415071c6c7ef947d0c0ba9fb34beb5f
parentf3d81719b0c56d93e3f33a0585fa1dca06f560e3
parent39323c753d753dc873fb362be5931eaea1152231
Merge branch 'MDL-35153-master' of https://github.com/mackensen/moodle