Merge branch 'MDL-30031-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE
commit9334f3d084a31e27a0a8072a6efd325b15aabe50
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jan 2012 01:14:45 +0000 (9 02:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jan 2012 01:14:45 +0000 (9 02:14 +0100)
treec14dee51558c90b4471efa4d197c0f2b7ac1446f
parentb48d180e396e2fe326f82f05c47bdc14e7bf371c
parent6a9b5984bdf479f85bacfb13c79554b79438286b
Merge branch 'MDL-30031-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE