Merge branch 'MDL-13629_droplow_23' of git://github.com/andyjdavis/moodle into MOODLE...
authorDan Poltawski <dan@moodle.com>
Wed, 25 Jul 2012 04:29:47 +0000 (12:29 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 25 Jul 2012 04:29:47 +0000 (12:29 +0800)

Trivial merge