Merge branch 'MDL-38969_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 21:13:32 +0000 (23:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 21:13:32 +0000 (23:13 +0200)
commitd2f77303b0c5e2d6250cbb57005a663c3820bcb4
tree6c4c962b12379182573c1c2fae3e78429e0e1790
parenta9aa326ea9e22ea8f9bb117b2decd64186769599
parent912a46dbced4aef67c00079d718956a975eda127
Merge branch 'MDL-38969_master' of git://github.com/dmonllao/moodle