Merge branch 'MDL-34711_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Aug 2012 00:09:25 +0000 (02:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Aug 2012 00:09:25 +0000 (02:09 +0200)
commit4ebc74c548ab79c7f10d49c4d403d832ba396a46
tree845e6eb71dd0f823d88b885f6d211f461011799f
parent8b77ab0c1039d56d975f366dfcbeececebaf125b
parentb53f4d55c8306e0ea0f5b11506c40de0b01d79be
Merge branch 'MDL-34711_master' of git://github.com/dmonllao/moodle