Merge branch 'MDL-38942_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 21:13:44 +0000 (23:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 21:13:44 +0000 (23:13 +0200)
commit5bd80500f2125137cbb33b95fdbd073ee60bc7e1
tree5709bfa77a1da0d4018d55289edec1659926e847
parentd2f77303b0c5e2d6250cbb57005a663c3820bcb4
parentad2f6440870e454d5d8b8484329cf14b97f7ed37
Merge branch 'MDL-38942_master' of git://github.com/dmonllao/moodle