Merge branch 'MDL-25760' of git://github.com/lazydaisy/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 1 Nov 2011 02:56:55 +0000 (15:56 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 1 Nov 2011 02:56:55 +0000 (15:56 +1300)
commitc189b664aed0ecfed2660de01707479993124b09
treed017c267ae1261442369b3bad1c95aa95f7436a5
parent5a866c36345e09ea01e4912852fd4a9bb3e28a75
parent1bc21356fcaebf29a30bfb273bd4b8ed7d3b57df
Merge branch 'MDL-25760' of git://github.com/lazydaisy/moodle