Merge branch 'wip-MDL-37983-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Mar 2013 15:42:25 +0000 (16:42 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Mar 2013 15:42:25 +0000 (16:42 +0100)
commit266e8dec4918ae97327e2366bfa90cf3ea7f9eef
tree86f6091ce3d3c23966def7a294e302d045a71824
parentd5834b37121167b9020c2a9efc1c84203264e669
parent03ee0c39b3c3119c4a2bae08d2d91bff12003ffa
Merge branch 'wip-MDL-37983-master' of git://github.com/abgreeve/moodle