Merge branch 'MDL-36838-FF17-MNETSSO-MASTER' of git://github.com/peterbulmer/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 28 Nov 2012 09:35:54 +0000 (17:35 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 28 Nov 2012 09:35:54 +0000 (17:35 +0800)

Trivial merge