Merge branch 'MDL-38590-master-int' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 23:14:36 +0000 (01:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Apr 2013 23:14:36 +0000 (01:14 +0200)
commit1b882ab87b8df8550275d2b80ceb8c205c75fdc8
tree03fd5ea95f8dfe2e0de53b0cf45dbc7b9ff33186
parent33871fbf3efcfca4a1fc7c17a359bd4a3b962797
parent8783e17b0fca49c066adeddc78f695b112a2c8ce
Merge branch 'MDL-38590-master-int' of git://github.com/FMCorz/moodle