Merge branch 'MDL-34275-master' of git://github.com/danpoltawski/moodle
commit3705a6dcbe14484146cb9814e7ef1abe8ec884f7
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 May 2013 17:15:21 +0000 (7 19:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 May 2013 17:15:21 +0000 (7 19:15 +0200)
treec141d4f0df3c9d33a9c0129e05287191d3860a0e
parent5b003e9cddc41c2a46969f5b610bc16220d39f79
parentb4d33e02c0abc7ac7c2b1002a32cffe294b73cc7
Merge branch 'MDL-34275-master' of git://github.com/danpoltawski/moodle