Merge branch 'w33_MDL-28981_m22_canpost' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 22:52:56 +0000 (00:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 22:52:56 +0000 (00:52 +0200)

Trivial merge