Merge branch 'master_MDL-27624' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 17:04:44 +0000 (19:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Aug 2011 17:04:44 +0000 (19:04 +0200)
commit379771a72355649c2d8e008778706cbd6fa3cf21
treee3bf5e83e90de88f532b851f4aca5e326b50afed
parentfb57247ed20f18090d18340000e9e89ca288277d
parent784967eab8b7bea37c5a94012a88bd15ba286b8f
Merge branch 'master_MDL-27624' of git://github.com/danmarsden/moodle