Merge branch 'MDL-35023' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 14:32:30 +0000 (16:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 14:32:30 +0000 (16:32 +0200)
commit05a024d393cd05e97a1ec286bcec0ac2daccc819
tree821037bc70a104f2480a3d626377abdcb16d6b0c
parentd324394594eae8f09f666bcccacecc1f66049253
parent2b3f70dbaddf2d85686256a9a133a01e4a45eace
Merge branch 'MDL-35023' of git://github.com/timhunt/moodle