Merge branch 'wip-MDL-47174-m27' of git://github.com/marinaglancy/moodle into MOODLE_...
commita618d350829574fa3a0388885765bbfe5dd09a02
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Nov 2014 01:15:54 +0000 (6 02:15 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Nov 2014 01:15:54 +0000 (6 02:15 +0100)
tree8efc34c3ba6ecd6cef65da5daf5fb12b7a3e94b8
parent7ef5172818239beaabdb5ded5a3b458694534ea9
parentd8b19527fe886b2ed85498f6f76d2383c5f1eca7
Merge branch 'wip-MDL-47174-m27' of git://github.com/marinaglancy/moodle into MOODLE_27_STABLE