Merge branch 'master_MDL-28962' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 16:31:01 +0000 (18:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 16:31:01 +0000 (18:31 +0200)
commit4a88ad2f2a711e556e2defd76b1c8512898be4a1
tree8134d4f06b6460993e67a15eef0ad945ec17f86f
parent8d30b1a97e8f7f21db74fb32f73f68fa2eefcecc
parent5375c60ad416221b1141c338f57c949354a794d8
Merge branch 'master_MDL-28962' of git://github.com/danmarsden/moodle