Merge branch 'MDL-29350-master-2' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Nov 2011 16:15:00 +0000 (17:15 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Nov 2011 16:15:00 +0000 (17:15 +0100)
commit408ea3b5470107f4f6c3f071a5317676445a331f
tree007f3ddd6071e67e801f9b6f9e1fd56ce5fe8162
parentf71e41691aadf938eab49314de5f0d5181e4d0c7
parent6336bd914a7adb446dc48b88a0f58bbcec795a17
Merge branch 'MDL-29350-master-2' of git://git.luns.net.uk/moodle