Merge branch 'MDL-26714_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE
commit656237dd558792032df3bf214301e00655eb2564
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 May 2011 10:26:22 +0000 (2 12:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 May 2011 10:26:22 +0000 (2 12:26 +0200)
tree09e84190e0cbbbb99e44be2ca99671451a6dedcb
parente3cc5b1a7f7d51669314bb4400b30aa9fe6d7f29
parent55e03d1233d67f9be478e968b6b04a129dacae09
Merge branch 'MDL-26714_20' of git://github.com/timhunt/moodle into MOODLE_20_STABLE