Merge branch 'MDL-33770' of git://github.com/mouneyrac/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Jul 2012 23:48:43 +0000 (11:48 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Jul 2012 23:48:43 +0000 (11:48 +1200)
commit2da0a383980c34fdb6448fb142a1fd90f4a72234
treedb3c10b1d248b25ee3a73b748ad334d54a58092a
parente1d7771b0f0c07f3ec039a7e603e1fbdce7dc7c6
parent32435a6968e9f7214af8cc3e4fe734553bb67b6c
Merge branch 'MDL-33770' of git://github.com/mouneyrac/moodle