Merge branch 'wip-MDL-40763-m26' of git://github.com/samhemelryk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 11:19:41 +0000 (13:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 11:19:41 +0000 (13:19 +0200)
commit8c2ed5704382ca5a58aaeb63037f5253193b4a21
tree57f47a11d88a8f0e9da3de88915071c7d6f535b6
parentd4731fd002bb8b2e1e93d1eb71ceefc659719e08
parent923f1c420c0e165d79b4ac74f1899f8fc1e39e9e
Merge branch 'wip-MDL-40763-m26' of git://github.com/samhemelryk/moodle