Merge branch 'MDL-40626-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE
commit9260f1bdd2bdc5f12cbad05324acaf02696804d7
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jul 2013 15:41:07 +0000 (22 17:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jul 2013 15:41:07 +0000 (22 17:41 +0200)
treeb4e44f8e20d3b69ac29ce999ec402ea722ed1ee8
parent9dae491a94ca86b28bd10b765f0fdc414c5d281b
parent58940c96c4f2f36e2f98b4bd87c0878c87ffa743
Merge branch 'MDL-40626-24' of git://github.com/danpoltawski/moodle into MOODLE_24_STABLE