Merge branch 'MDL-28100' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jul 2011 22:12:19 +0000 (00:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jul 2011 22:12:19 +0000 (00:12 +0200)
commit4357214a49d5208bc3765af15b39cfb2c0787202
treedccf7e0101962ac20acb1f3f6b2b99ab30de1428
parentb274bc55d0098aed0362b934c108177e70aadfd4
parent2207a21bfe91a221985300d712df93f8a20b9e3a
Merge branch 'MDL-28100' of git://git.luns.net.uk/moodle