Merge branch 'MDL-38666-m' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 23:04:00 +0000 (01:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 23:04:00 +0000 (01:04 +0200)
commit5c98b64b00f0cbe6e017c9c7d88e7ec1d12d3ddf
tree07ad0c080554e29a8101e6df31167fc58e6c3d1c
parent235fc2562cbcd7aa76b6328f48d56eb59e0fb227
parent5e8dddc1670b371fe3e094f2cf7d9c30e5c3b02e
Merge branch 'MDL-38666-m' of git://github.com/andrewnicols/moodle