Merge branch 'wip-mdl-38543' of git://github.com/deraadt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Mar 2013 01:00:02 +0000 (02:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Mar 2013 01:00:02 +0000 (02:00 +0100)
commit3b597dd4ee91e42d14b56d5d3f5955445e9f6d2a
treefa3afa0002385f751c8fe910d51e2d09e68bbbf0
parent49ef0c56efc1996e8971f9b806f6e69fdebf5774
parent4b6bf04659fdd3b32571c8b5520ff0066b0d4b51
Merge branch 'wip-mdl-38543' of git://github.com/deraadt/moodle