Merge branch 'MDL-38622_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2013 13:51:17 +0000 (15:51 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Apr 2013 13:51:17 +0000 (15:51 +0200)
commit871da25a40a0bb4e6dcee6f84c2d5c54ca9b64bc
treecb2d628af343fa70de85772d9282d99d5112c887
parent08aa2c3b81e16ed8e02498c200a738cbfa060512
parent739ac54ab0003ae5519c00b76c3d5c3e36b0359a
Merge branch 'MDL-38622_master' of git://github.com/dmonllao/moodle