Merge branch 'MDL-27884-master' of git://github.com/ankitagarwal/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 Jan 2013 05:30:24 +0000 (13:30 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Jan 2013 05:30:24 +0000 (13:30 +0800)

Trivial merge