Merge branch 'MDL-38470-m' of https://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 Mar 2013 00:47:52 +0000 (01:47 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 20 Mar 2013 00:47:52 +0000 (01:47 +0100)
commitcfe6a96f0ad2ff6e7c08eb4c7b1f738eac15c773
tree1bf73492ea8a8428cbc9e4ff31b00d7830f974f7
parent99b3e4e7bdb39eae6a3812cd9dc89f463fa78310
parentc5952e06f19691b83f88236755cceba4d30fd997
Merge branch 'MDL-38470-m' of https://github.com/andrewnicols/moodle