Merge branch 'master_MDL-36467' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 14 Nov 2012 01:30:59 +0000 (09:30 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Nov 2012 01:30:59 +0000 (09:30 +0800)

Trivial merge