Merge branch 'MDL-34250' of github.com:stronk7/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 18:44:09 +0000 (20:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Aug 2012 18:44:09 +0000 (20:44 +0200)
commit928dfdee48e0fbe94039bfa1b281c8f6981dc735
treed85ecd1efff1c7f3d039955388fae3cec991cf00
parent2ab9b983be5ee83729c55eee294e7938cfe9f3a1
parent111938abd98bc5a04436437d9c1d8d5f6f1ecb11
Merge branch 'MDL-34250' of github.com:stronk7/moodle