Merge branch 'MDL-34783-MOODLE_23_STABLE-1' of git://git.luns.net.uk/moodle into...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Aug 2012 20:45:34 +0000 (22:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Aug 2012 20:45:34 +0000 (22:45 +0200)

Trivial merge