Merge branch 'MDL-30182' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Nov 2011 09:53:56 +0000 (10:53 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Nov 2011 09:53:56 +0000 (10:53 +0100)
commitf71e41691aadf938eab49314de5f0d5181e4d0c7
tree323f4ccb5b41c157b56fd4d7c1687190ae4c8d69
parentb750c6b3884ea3ba33ffdd4040e44bf1fd8a20b8
parent0850e6301a7abb9b9f2a72cffdb9cc39eeb0e8b6
Merge branch 'MDL-30182' of git://github.com/timhunt/moodle