Merge branch 'MDL-29763_portfolio_description' of git://github.com/davosmith/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jun 2015 23:39:55 +0000 (01:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 22 Jun 2015 23:39:55 +0000 (01:39 +0200)

Trivial merge