Merge branch 'MDL-39932_25' of git://github.com/grabs/moodle into MOODLE_25_STABLE
commit189590bb37854c1d8593d699314cc8ac09912532
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Jun 2013 17:10:39 +0000 (3 19:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Jun 2013 17:10:39 +0000 (3 19:10 +0200)
tree5d37ecd3e38be90ca924563bb8629b250474b55b
parent827e54dde571acee190a93c1bfbf1422d5b21af0
parentb4de832553ebd8a32181acba730446a5cef02165
Merge branch 'MDL-39932_25' of git://github.com/grabs/moodle into MOODLE_25_STABLE