Merge branch 'MDL-33306_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2012 22:30:59 +0000 (00:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2012 22:30:59 +0000 (00:30 +0200)
commit8a716e23628fe3a70d214c046345434d4bc7d229
tree19c17dbb75fff8087e38301066b7b8372c8c50ef
parent20182f867037608bd44d64714e6198b2b0669913
parent3b5245cd6b32534e8a5ebd355a70f3f0492a376d
Merge branch 'MDL-33306_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE