Merge branch 'MDL-32688' of git://github.com/itamart/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2012 23:53:15 +0000 (01:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2012 23:53:15 +0000 (01:53 +0200)
commitf3d81719b0c56d93e3f33a0585fa1dca06f560e3
treeaa5434796eeab1464839748a80d8a5e36cd903d7
parent9577f6ee94dd38ad7b0d0380042ca378754f3dbf
parent613921c6bf74c95d6acea5734709de470ce7ba85
Merge branch 'MDL-32688' of git://github.com/itamart/moodle