Merge branch 'MDL-37332-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE
commit0e73df9df61e7d3c2a43598d5ef0770af0279207
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jun 2013 00:27:35 +0000 (5 02:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jun 2013 00:27:35 +0000 (5 02:27 +0200)
treee61e18eb6332ebe8a4a887e1f93b7d2d0c03003a
parentab8e75ef407028c94a55bad76e6fde0be02c6311
parente9fd6e5dd62551bfe0a1422a33cef277d7533a72
Merge branch 'MDL-37332-25' of git://github.com/danpoltawski/moodle into MOODLE_25_STABLE