Merge branch 'w04_MDL-31185_m23_postscfg' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 22 Jan 2012 23:28:08 +0000 (00:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 22 Jan 2012 23:28:08 +0000 (00:28 +0100)

Trivial merge