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)
commit6f24d3183e96b00c5645333624c84d4a704136d3
treef46264692cfd1e9fc0a2b4ead488d3ae6b627efd
parent0c21bb606b7ba470a3d1f77ea44ea25fbd4bfd48
parent1c65f683dc0a52e47fdf68e952c832d7c63e03a0
Merge branch 'MDL-36838-FF17-MNETSSO-MASTER' of git://github.com/peterbulmer/moodle