Merge branch 'MDL-38956_master' of git://github.com/dmonllao/moodle
commitb279f334101f12d157504c948f60d9f452cb523a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Apr 2013 10:50:50 +0000 (17 12:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 17 Apr 2013 10:50:50 +0000 (17 12:50 +0200)
tree88be8d9d904bad3b25236437a5856e030c19ffc0
parent9b0f001445b4cbfa05e38812a918afdfd5fa4767
parent242a27b180ef0c6b251aa2b3069d04c5f5199543
Merge branch 'MDL-38956_master' of git://github.com/dmonllao/moodle