Merge branch 'MDL-30122' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 23:33:54 +0000 (00:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 23:33:54 +0000 (00:33 +0100)
commite929eb035349c7e8ad57ec03cb0b9583ae45e67b
tree79a1457461189fcdded2dd356e6f0efea6fb1c7f
parentb22dc5374ceac6ff1213c6e9a04e7cf6de7266c6
parent94c0ec215925dd52a5c8ea8ba59e62ef7c236c5d
Merge branch 'MDL-30122' of git://github.com/timhunt/moodle