Merge branch 'MDL-35924_master' of https://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Jan 2013 18:41:45 +0000 (19:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Jan 2013 18:41:45 +0000 (19:41 +0100)
commit6ee4df92abb50af51614743ca6772c4d9a2ea605
tree3e8c6df2fbdbf42b038457c63921b1f794f38980
parent509c2758ceeac22144925a9036b2edde98bfe065
parente06bfd3df3b04c9b390b1fd4e4d768661e61cf75
Merge branch 'MDL-35924_master' of https://github.com/markn86/moodle