Merge branch 'MDL-34971-wip' of git://github.com/mouneyrac/moodle
commitc3f06aacef38236d532ffb4c0e58b8a99d38f55e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Oct 2012 10:48:48 +0000 (1 12:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Oct 2012 10:48:48 +0000 (1 12:48 +0200)
treec43711be4a42bf734ad5204991c12e1d0ef1e8e3
parentb69927877349a9cde508e6b2a3c9835b8612287d
parent36a7059542ad32210c638094af445ca40ee2ed39
Merge branch 'MDL-34971-wip' of git://github.com/mouneyrac/moodle