Merge branch 'master_MDL-25757' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 10:07:50 +0000 (11:07 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 10:07:50 +0000 (11:07 +0100)
commit3a02133f3f86778d64a116fab7f560d6e15b782a
tree064f3c41469c069fa53fefd973a4d1b3fe8d749f
parentc32e3a0a0afa3a25d5a023ae6bfad8b447dc0703
parent23b3e448b274330b25f20c87525ad6e988173d6a
Merge branch 'master_MDL-25757' of git://github.com/danmarsden/moodle