Merge branch 'wip-MDL-37028-fix2' of git://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 11 Sep 2013 08:55:13 +0000 (16:55 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 11 Sep 2013 08:55:13 +0000 (16:55 +0800)
commitfa8b1fa4a4b592056938110735205bd867f19f23
treeb2c6d75f6094c5485e3e2161770d75349d90c117
parente3a1fa4be88371a3c4bbb9448aa349b1ec0a6c46
parentcfda8732b77e50ae395b44188e2c7596f4d7646c
Merge branch 'wip-MDL-37028-fix2' of git://github.com/marinaglancy/moodle