Merge branch 'wip-MDL-21097-m25' of git://github.com/marinaglancy/moodle into MOODLE_...
commitef580461f69a77b356151f9eb25e0ef40449bf30
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jun 2013 08:36:22 +0000 (5 10:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jun 2013 08:36:22 +0000 (5 10:36 +0200)
treecfd5c1b5f4e33fcd1077fcf86582f3315e4a017d
parente0e6015416487391c8ac3c4d4e8aaff6662ec3ce
parentf9d68a11da63c07df42148759a21c8e6ab8484f4
Merge branch 'wip-MDL-21097-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE