Merge branch 'MDL-35038' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 14:24:17 +0000 (16:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 14:24:17 +0000 (16:24 +0200)
commitd324394594eae8f09f666bcccacecc1f66049253
treeb3ae3b871b667628d332180cf3f4acc97d31e56b
parenta787a404ea7541706c987cc453b1f45433685d24
parentf8d354282c9510de20332c875b05de37a01d8eee
Merge branch 'MDL-35038' of git://github.com/timhunt/moodle