Merge branch 'MDL-39232_master' of git://github.com/dmonllao/moodle
commit6a222aa127fc3cb10827cd1ce49f1b5f560d4a1a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 Apr 2013 22:47:32 +0000 (1 00:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 Apr 2013 22:47:32 +0000 (1 00:47 +0200)
tree26d92e33bf8aaa28b3e1bc2d5490e70ff05432ea
parentfdba83df89e7888736e3dbd736feae01e20e62f1
parent550d842e3cd702aa73fa22d45ec8a4e02a607a31
Merge branch 'MDL-39232_master' of git://github.com/dmonllao/moodle