Merge branch 'MDL-39420' of git://github.com/timhunt/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 9 Jul 2013 14:43:54 +0000 (22:43 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 9 Jul 2013 14:43:54 +0000 (22:43 +0800)
commitc6df1f5ad0b21cce0843071d0a56f7fec56ba94e
treeb1ab0496c4b5884b8530acf73b55ccc0c28b70e7
parent57cf73a8255fd165d6106576897f7125b14d5d16
parentdad5f63d3da79b4d1555429e5ff7f8f6e9b1034d
Merge branch 'MDL-39420' of git://github.com/timhunt/moodle