Merge branch 'wip-MDL-43398-m25' of git://github.com/marinaglancy/moodle into MOODLE_...
commit21e91b92873f15615ad04ee5b8d1483bdeef7f87
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 00:50:51 +0000 (2 02:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 2 Apr 2014 00:50:51 +0000 (2 02:50 +0200)
treed883627efb62d5fa7e08fce114a8113b3092244d
parentc2b8818c7184218fbb32e93097358c7a5a4bfb01
parent8f3311bc5e713cec5c09bbf95df213e4fabde5c1
Merge branch 'wip-MDL-43398-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE