Merge branch 'MDL-35003' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 15:50:55 +0000 (17:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 15:50:55 +0000 (17:50 +0200)
commit7f7cda07f2ca535fc686c4a7d859696c92d1ee92
tree83269b5a68d7d76eb6507a41c78f74d23121e7ce
parent05a024d393cd05e97a1ec286bcec0ac2daccc819
parent9c2e178e2fd435c52abaf781f58eb6aa9ff5bf9b
Merge branch 'MDL-35003' of git://github.com/timhunt/moodle