Merge branch 'MDL-30001' of git://github.com/jmvedrine/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 12 Aug 2013 07:54:53 +0000 (15:54 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 12 Aug 2013 07:54:53 +0000 (15:54 +0800)

Trivial merge