Merge branch 'MDL-35620' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Oct 2012 08:28:28 +0000 (10:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Oct 2012 08:28:28 +0000 (10:28 +0200)
commitfc561b20896100b2b3da2bfac5c68e8829b9df0c
treefefb9c405c9a6372e48a80a0eb79156a639ae00a
parent7a9b6cb6f211a3ccdbeec165e8238cfbdef321c7
parent65cf651fd8ecbc7dd1f803a8ca2eb8d94f71e065
Merge branch 'MDL-35620' of git://github.com/timhunt/moodle