Merge branch 'MDL-43395-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Jan 2014 18:10:13 +0000 (19:10 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Jan 2014 18:10:13 +0000 (19:10 +0100)
commitc33eb444fc982c063f524c861caa8545dacebf02
tree779a84800ed86f15b77da57e0a7316fd818e6e07
parentb9da30cfd2067cce1c999b8837f2e3e1de362000
parentc582565a0650ed667f93d67feac1ceb2f8ee94ff
Merge branch 'MDL-43395-master' of git://github.com/danpoltawski/moodle