Merge branch 'MDL-30167' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 23:29:18 +0000 (00:29 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 23:29:18 +0000 (00:29 +0100)
commitb22dc5374ceac6ff1213c6e9a04e7cf6de7266c6
tree5230e1f815cc2a34b31ad45a8768ee40770db5cf
parente5bac3491a9219163ec24dc4f7f1e96796d77787
parent6c314a368113c07a8d7da0aeac04771520413132
Merge branch 'MDL-30167' of git://github.com/timhunt/moodle