Merge branch 'MDL-28686-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE
commit2b4dcfdcbd97cfb4f46a6bb4886addc45d08b2ac
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Sep 2011 22:54:49 +0000 (27 00:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Sep 2011 22:54:49 +0000 (27 00:54 +0200)
treea841709eb9f1a78977cb72731472e0a4f2327975
parentfe245b725b23c5aa7e71486c0071fa86e4eeb98c
parentd5ae2ed1126e41bdce0dd3cab6e5ec685e60d51f
Merge branch 'MDL-28686-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE