Merge branch 'MDL-31121-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Jan 2012 00:40:20 +0000 (01:40 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Jan 2012 00:40:20 +0000 (01:40 +0100)
commit8300d8894ce5d843b72ad127ce0d333f9f812816
tree6e791707cf93e38b810cf6380725cec672495a49
parent00a4543c5b5482bdeea39f543614c636ad47955e
parenta2c5766674bfe4871408c10be3c4532724e5f89f
Merge branch 'MDL-31121-master' of git://github.com/sammarshallou/moodle