Merge branch 'MDL-38476_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Apr 2013 23:06:05 +0000 (01:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Apr 2013 23:06:05 +0000 (01:06 +0200)
commit2bb24f16e097a16a489a8a24877916c742f76b11
treed635be831965acfe7b3213c702ad1f376783d311
parent55a2081d2832193cc9db54a61f83321a402465bf
parent22d56e46f1c45aea667a0406134934439ef21e57
Merge branch 'MDL-38476_master' of git://github.com/dmonllao/moodle