Merge branch 'master_MDL-27959' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jun 2011 23:35:15 +0000 (01:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jun 2011 23:35:15 +0000 (01:35 +0200)
commitf5a6bf5e35e138af5d711eb251c887bb10e03bac
tree8c41936482857cf54d1f03065e6e6d64f844d2e4
parentc1ab2b109e7ce6b9c93e93f8646f801ad43e02cc
parentb447192e8f4fa68546d0177945a251968a1927d7
Merge branch 'master_MDL-27959' of git://github.com/danmarsden/moodle