Merge branch 'MDL-28975_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
commit7a4a1f14ca2e772e5d24c20c422d19cd9ec314fa
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 23:45:23 +0000 (24 01:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 23:45:23 +0000 (24 01:45 +0200)
treefc59250bc3481f91f3e50f759f7187411e07f00a
parentfad5ec9b5af6d993c7cc0eae4258121bcc4c0e97
parent0a20ddbe7dcab2941931b74ee670dffb01218765
Merge branch 'MDL-28975_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE