Merge branch 'w42_MDL-42292_m26_blockversion' of https://github.com/skodak/moodle
commitf71011e825a92b501b0e7c618fedf84b5dfaed8e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Oct 2013 21:09:53 +0000 (13 23:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Oct 2013 21:09:53 +0000 (13 23:09 +0200)
treeb2681ddea2a471ee455cd57ada6cdc67c0cbb8d5
parent6ad40de4652dc77b31fb390ffdd199baab0dd724
parentc66b839a14f40de4d60caa836948dbeb31732a77
Merge branch 'w42_MDL-42292_m26_blockversion' of https://github.com/skodak/moodle