Merge branch 'MDL-38615_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 15:12:04 +0000 (17:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 15:12:04 +0000 (17:12 +0200)
commit7191a59fc9d5e8f66511648edc501bbd60a68f8a
treec17af44ae7e2c5b86eb21f79196ddac90cfe3f6f
parent6b117438b92febcd107e26f24417482b1ff9cbbb
parent7fcf94cb1a42f99aba6fbc9cafe6063033009ce5
Merge branch 'MDL-38615_master' of git://github.com/dmonllao/moodle