Merge branch 'MDL-31262_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
commit13689e7d2062f1699828682f96efa17663291d1a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 01:23:42 +0000 (2 03:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 01:23:42 +0000 (2 03:23 +0200)
treea920340e9bf19587d8f45a59f9a2e01eed120151
parent7b5cd3154d8573ae6c6a1917bb4474c25cde2854
parentbb42f6d46fffbf434df0bb1f3613d391b91e9f60
Merge branch 'MDL-31262_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE