Merge branch 'MDL-34862' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Aug 2012 01:30:56 +0000 (03:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Aug 2012 01:30:56 +0000 (03:30 +0200)
commit7ccede7af8ddae3398006dea82938fe65a97107e
tree7cc6a0da2fd00b179639609973d73f55e3866aec
parent9e586967a6fec6d1efa3c89fad811ee2add9873a
parent4c16e191e16941cf241a6f746fd27cbe6575bf5b
Merge branch 'MDL-34862' of git://github.com/timhunt/moodle