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

Trivial merge