Merge branch 'MDL-35133_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2012 15:47:50 +0000 (17:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2012 15:47:50 +0000 (17:47 +0200)
commitb9d24254bd12d8d57f92edfd094a1ec698cb3dd0
tree478cc53b6b72ae450cd3137999626a2b9f22596f
parenta31d7a0ed3066dd52e9aa59d4669a8712f30b407
parentfd126f94aaee95a1d3ab8c14c0440769bba513e7
Merge branch 'MDL-35133_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE