Merge branch 'MDL-38820_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 17:59:45 +0000 (19:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Apr 2013 17:59:45 +0000 (19:59 +0200)
commitc1fc4ba397c38fa0941cb4b2cc04c9d35bc59227
treefaeee316ae06941fa9fc3acac072ea5b11b6961e
parent26b7bea2c05ad452275c49c602b843442f3862e4
parent594b5a7f5ff4992c0bd022b3c1a6f47fe4a473c7
Merge branch 'MDL-38820_master' of git://github.com/dmonllao/moodle