Merge branch 'MDL-41962-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 30 Sep 2013 23:52:53 +0000 (01:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 30 Sep 2013 23:52:53 +0000 (01:52 +0200)
commitb1698e9ac578081797abe13bd52bf41aecce23bc
tree58b6e6abcb47fb22beef272fb4f9eae829b29503
parent53be2d782a038f085508d6c54d6a1278553d7883
parent5cec6c267057c2f4e1ab18f6eef83fe6d8671c3c
Merge branch 'MDL-41962-master' of git://github.com/FMCorz/moodle