Merge branch 'MDL-27848_for_master' of git://github.com/kordan/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jun 2011 22:48:56 +0000 (00:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jun 2011 22:48:56 +0000 (00:48 +0200)
commitd55ecccb9b1085fa290394623b2690a7a1b02a02
treea326c59bd60b1bb1a5235de50b2fbbfbdaddc81a
parentee1235e7afe51b7a9d5c5933192108afc93d7147
parentdb3b8953ce85b5b05b887ac716024f1b46d3b481
Merge branch 'MDL-27848_for_master' of git://github.com/kordan/moodle