Merge branch 'MDL-35556c' of git://github.com/srynot4sale/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 8 Nov 2012 07:07:17 +0000 (15:07 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 8 Nov 2012 07:07:17 +0000 (15:07 +0800)

Trivial merge