Merge branch 'master_MDL-29159' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Nov 2011 01:20:26 +0000 (02:20 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Nov 2011 01:20:26 +0000 (02:20 +0100)
commitb7830daba1f9b3d6f393d03bcabcca32e9bf3abb
treee1b62a8e7e8ef4edab6dafc8537afa1e0ebb56ed
parent0a9ed36c9e533fc3c5987ca131cb7b702f50cae7
parent7320f48b987729fabc6907684995164765cf7e15
Merge branch 'master_MDL-29159' of git://github.com/danmarsden/moodle