Merge branch 'MDL-36900-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Mar 2013 23:45:59 +0000 (00:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Mar 2013 23:45:59 +0000 (00:45 +0100)
commit705d41c895292b89aec658f441a1f90e3c1d4002
treed0b7e8da15e6a188859de38f916d44a90d27cf66
parent8ed6ee97a64c8ebd808c06b095a08c9d973c3a5f
parent04cbea2cd61a504bd53a8b1bf3dfaf64e3af26ac
Merge branch 'MDL-36900-master' of git://github.com/FMCorz/moodle