Merge branch 'MDL-30186' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 23:11:29 +0000 (00:11 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 23:11:29 +0000 (00:11 +0100)
commit2c9073ab2a48495221b03601f9c82ab782b2d4a2
tree40c5418febb1425a60d4ccdc725156944e79e7a8
parent0918488decebf235778bef1b4a2abfeaca248fae
parentf7094147b14befe00600eae4eb10c4bd8535e1a0
Merge branch 'MDL-30186' of git://github.com/timhunt/moodle