Merge branch 'wip-MDL-26348-m24' of git://github.com/samhemelryk/moodle
commitda6675d6330e401fbf1b77524b10b940a2c11f2f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 23:38:01 +0000 (9 01:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 23:38:01 +0000 (9 01:38 +0200)
treef81d2c07f18761e8826ec1836cb1885c7695fb9d
parentb9570857db345580fc7582802330a53326443c21
parent6a3b5e896d87f216783406a7c4d0c155386a1b6e
Merge branch 'wip-MDL-26348-m24' of git://github.com/samhemelryk/moodle