Merge branch 'wip-MDL-42912-master' of git://github.com/marinaglancy/moodle
commit234159ee9de524ce8415260d5173cf19bb7288ba
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 15 Nov 2013 01:04:45 +0000 (15 02:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 15 Nov 2013 01:04:45 +0000 (15 02:04 +0100)
tree2710e8f211f02647d2f1e99c88faac1071e44290
parenta269acfef7beac743d0ce6a889767f27f04c76d8
parentceeb8102cde899e9996cb514859d7d25ab42d2a3
Merge branch 'wip-MDL-42912-master' of git://github.com/marinaglancy/moodle