Merge branch 'MDL-41163-master' of git://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 9 Sep 2013 07:29:48 +0000 (15:29 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 9 Sep 2013 07:29:48 +0000 (15:29 +0800)

Trivial merge