Merge branch 'wip-MDL-29071-m24' of git://github.com/marinaglancy/moodle into MOODLE_...
commit0ecaebd48710af2105a161b1898f768923c65c88
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 24 Nov 2013 15:51:37 +0000 (24 16:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 24 Nov 2013 15:51:37 +0000 (24 16:51 +0100)
tree9d9c2fd06447e6d4078caf214c94ea793d6b6500
parenta61d4eff50879c21a83e1a09fd95318f0d27e43d
parent6cf0f60c7dc4e7e21bdd5ff1179232c6437b84c7
Merge branch 'wip-MDL-29071-m24' of git://github.com/marinaglancy/moodle into MOODLE_24_STABLE