Merge branch 'wip-MDL-43283-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 9 Jan 2014 22:07:19 +0000 (23:07 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 9 Jan 2014 22:07:19 +0000 (23:07 +0100)
commit24d74a68046c1b23bca4aec1b836a8bbcc5a0004
treed03665c7cd2a22cb7e8e5d61700a46417718b86e
parentc2dc13a0178722ba4821ec4e28cb03233cdd923f
parent1f47813b291827ed35dc2b27f88058fecd55e616
Merge branch 'wip-MDL-43283-master' of git://github.com/marinaglancy/moodle