Merge branch 'MDL-32285_master' of https://github.com/nadavkav/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Mar 2015 23:30:16 +0000 (00:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Mar 2015 23:30:16 +0000 (00:30 +0100)
commit0b8cb023c1352864a13ce4d57363bcf3334d684e
tree3c3b703fcf48b9373f220a1b3cd9e57307825cd0
parentc1f4001bd135b8ce5643a8fde623441683c3ecbd
parent47ecb3749e098cd242a8ef0e1e7e8328a4764661
Merge branch 'MDL-32285_master' of https://github.com/nadavkav/moodle