Merge branch 'MDL-34756-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Aug 2012 14:35:20 +0000 (16:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Aug 2012 14:35:20 +0000 (16:35 +0200)
commit331d346e8f0bed92f2fb67baa6940538ddaacc1d
treef05176c4b129be96219a5ee34313cde3df4aafce
parent8ee474b89e608f623858d1a40ab3a1bc710c52a0
parent70746c433c0d687163cfc0f1b9af837789e05575
Merge branch 'MDL-34756-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE