Merge branch 'w02_MDL-29046_m23_clidistrolib' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jan 2012 01:31:02 +0000 (02:31 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jan 2012 01:31:02 +0000 (02:31 +0100)

Trivial merge