Merge branch 'MDL-37619-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Jan 2013 01:07:53 +0000 (02:07 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Jan 2013 01:07:53 +0000 (02:07 +0100)
commitc9c75b39fd1b5c2e10ddd9e5d43be87fdd9d544e
tree74ff9c54b108903f17802bc3a59b495453a28bcf
parentad3a730c3ade750c4ae26ba913422da61e296da1
parentc1432fad2cd5ce28f5a2cf6089d75c78ddbdd2a9
Merge branch 'MDL-37619-master' of git://github.com/damyon/moodle